saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix test by switching to a repo we own and pinning to a tag.

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-01-23 11:56:29 +00:00 • committed by Megan Wilhite
parent c4fa5a641f
commit 92a845cacf
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/integration/modules/test_pip.py
View file

@ -31,9 +31,6 @@ class PipModuleTest(ModuleCase):
# Remove the venv test directory
self.addCleanup(shutil.rmtree, self.venv_test_dir, ignore_errors=True)
self.venv_dir = os.path.join(self.venv_test_dir, "venv")
self.pip_temp = os.path.join(self.venv_test_dir, ".pip-temp")
if not os.path.isdir(self.pip_temp):
os.makedirs(self.pip_temp)
self.patched_environ = patched_environ(
PIP_SOURCE_DIR="",
PIP_BUILD_DIR="",
@ -517,7 +514,7 @@ class PipModuleTest(ModuleCase):
@pytest.mark.slow_test
def test_pip_install_multiple_editables(self):
editables = [
"git+https://github.com/jek/blinker.git#egg=Blinker",
"git+https://github.com/saltstack/istr.git@v1.0.1#egg=iStr",
"git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting",
]
@ -540,10 +537,11 @@ class PipModuleTest(ModuleCase):
if self._check_download_error(ret["stdout"]):
self.skipTest("Test skipped due to pip download error")
self.assertEqual(ret["retcode"], 0)
match = re.search(
"Successfully installed Blinker(.*) SaltTesting(.*)", ret["stdout"]
)
assert match is not None
for package in ("iStr", "SaltTesting"):
self.assertRegex(
ret["stdout"],
r"(?:.*)(Successfully installed)(?:.*)({})(?:.*)".format(package),
)
except KeyError as exc:
self.fail(
"The returned dictionary is missing an expected key. Error: '{}'."
@ -553,7 +551,7 @@ class PipModuleTest(ModuleCase):
@pytest.mark.slow_test
def test_pip_install_multiple_editables_and_pkgs(self):
editables = [
"git+https://github.com/jek/blinker.git#egg=Blinker",
"git+https://github.com/saltstack/istr.git@v1.0.1#egg=iStr",
"git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting",
]
@ -576,7 +574,7 @@ class PipModuleTest(ModuleCase):
if self._check_download_error(ret["stdout"]):
self.skipTest("Test skipped due to pip download error")
self.assertEqual(ret["retcode"], 0)
for package in ("Blinker", "SaltTesting", "pep8"):
for package in ("iStr", "SaltTesting", "pep8"):
self.assertRegex(
ret["stdout"],
r"(?:.*)(Successfully installed)(?:.*)({})(?:.*)".format(package),

4
tests/pytests/unit/modules/test_pip.py
View file

@ -156,7 +156,7 @@ def test_install_editable_without_egg_fails():
def test_install_multiple_editable():
editables = [
"git+https://github.com/jek/blinker.git#egg=Blinker",
"git+https://github.com/saltstack/istr.git@v1.0.1#egg=iStr",
"git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting",
]
@ -192,7 +192,7 @@ def test_install_multiple_editable():
def test_install_multiple_pkgs_and_editables():
pkgs = ["pep8", "salt"]
editables = [
"git+https://github.com/jek/blinker.git#egg=Blinker",
"git+https://github.com/saltstack/istr.git@v1.0.1#egg=iStr",
"git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting",
]