Merge pull request pulp#877 from jobselko/fix_nightly

Fix tests to account for new fixtures

(cherry picked from commit ee1aed2)
(cherry picked from commit 7433f61)

Author: jobselko

CHANGES/876.bugfix

@@ -0,0 +1 @@
+Fixed tests to account for new fixtures.

pulp_python/tests/functional/api/test_download_content.py

@@ -14,6 +14,7 @@
     PYTHON_MD_PROJECT_SPECIFIER,
     PYTHON_MD_FIXTURE_SUMMARY,
     PYTHON_LG_FIXTURE_SUMMARY,
+    PYTHON_LG_FIXTURE_PRERELEASES_SUMMARY,
     PYTHON_LG_PROJECT_SPECIFIER,
 )
 from pulp_python.tests.functional.utils import (
@@ -126,7 +127,9 @@ def test_full_fixtures_to_pulp_sync(self):
         """
         remote = self._create_remote(includes=[], prereleases=True)
         repo = self._create_repo_and_sync_with_remote(remote)
-        self.assertEqual(get_content_summary(repo.to_dict()), PYTHON_LG_FIXTURE_SUMMARY)
+        self.assertEqual(
+            get_content_summary(repo.to_dict()), PYTHON_LG_FIXTURE_PRERELEASES_SUMMARY
+        )
 
     def test_full_pulp_to_pulp_sync(self):
         """

pulp_python/tests/functional/api/test_full_mirror.py

@@ -108,21 +108,26 @@ def test_pull_through_install(self):
         remote = self._create_remote(url=PYPI_URL)
         distro = self._create_distribution(remote=remote.pulp_href)
 
-        if self.cli_client.run(("pip", "list")).stdout.find("numpy") == -1:
-            content = self.content_api.list(name="numpy")
-            self.assertEqual(content.count, 0, msg="numpy content already present in test")
+        PACKAGE = "sampleproject"
+        if self.cli_client.run(("pip", "list")).stdout.find(PACKAGE) == -1:
+            content = self.content_api.list(name=PACKAGE)
+            self.assertEqual(
+                content.count, 0, msg=f"{PACKAGE} content already present in test"
+            )
             host = urlsplit(PULP_CONTENT_BASE_URL).hostname
             url = urljoin(self.PYPI_HOST, f"{distro.base_path}/simple/")
             out = self.cli_client.run(
-                ("pip", "install", "--trusted-host", host, "-i", url, "numpy")
+                ("pip", "install", "--trusted-host", host, "-i", url, PACKAGE)
             )
             self.addCleanup(delete_orphans)
-            self.assertTrue(self.cli_client.run(("pip", "list")).stdout.find("numpy") != -1, out)
-            self.addCleanup(self.cli_client.run, ("pip", "uninstall", "numpy", "-y"))
-            content = self.content_api.list(name="numpy")
+            self.assertTrue(
+                self.cli_client.run(("pip", "list")).stdout.find(PACKAGE) != -1, out
+            )
+            self.addCleanup(self.cli_client.run, ("pip", "uninstall", PACKAGE, "-y"))
+            content = self.content_api.list(name=PACKAGE)
             self.assertEqual(content.count, 1)
         else:
-            self.skipTest("Uninstall numpy before running this test")
+            self.skipTest(f"Uninstall {PACKAGE} before running this test")
 
     def test_pull_through_simple(self):
         """Tests that the simple page is properly modified when requesting a pull-through."""

pulp_python/tests/functional/constants.py

@@ -145,14 +145,16 @@
     "celery",  # matches 13
     "Django",  # matches 31
     "scipy",  # matches 23
+    "setuptools",  # matches 2
     "shelf-reader",  # matches 2
 ]
-PYTHON_LG_PACKAGE_COUNT = 76
+PYTHON_LG_PACKAGE_COUNT = 78
 PYTHON_LG_FIXTURE_SUMMARY = {PYTHON_CONTENT_NAME: PYTHON_LG_PACKAGE_COUNT}
+PYTHON_LG_FIXTURE_PRERELEASES_SUMMARY = {PYTHON_CONTENT_NAME: 92}
 PYTHON_LG_FIXTURE_COUNTS = {
-    "latest_3": 35,
-    "sdist": 23,
-    "bdist_wheel": 53,
+    "latest_3": 37,
+    "sdist": 24,
+    "bdist_wheel": 54,
 }
 
 DJANGO_LATEST_3 = 4  # latest version has 2 dists, each other has 1