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 (
@@ -103,21 +104,25 @@ def test_basic_pulp_to_pulp_sync(self):
             cfg.get_content_host_base_url(),
             "pulp/content",
             distro.base_path,
-            ""
+            "",
         ]
         unit_url = "/".join(url_fragments)
 
         # Sync using old Pulp content api
         body["url"] = unit_url
         remote = self._create_remote(**body)
         repo2 = self._create_repo_and_sync_with_remote(remote)
-        self.assertEqual(get_content_summary(repo2.to_dict()), PYTHON_LG_FIXTURE_SUMMARY)
+        self.assertEqual(
+            get_content_summary(repo2.to_dict()), PYTHON_LG_FIXTURE_SUMMARY
+        )
 
         # Sync using new PyPI endpoints
         body["url"] = distro.base_url
         remote = self._create_remote(**body)
         repo3 = self._create_repo_and_sync_with_remote(remote)
-        self.assertEqual(get_content_summary(repo3.to_dict()), PYTHON_LG_FIXTURE_SUMMARY)
+        self.assertEqual(
+            get_content_summary(repo3.to_dict()), PYTHON_LG_FIXTURE_SUMMARY
+        )
 
     def test_full_fixtures_to_pulp_sync(self):
         """
@@ -126,7 +131,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):
         """
@@ -140,12 +147,18 @@ def test_full_pulp_to_pulp_sync(self):
 
         remote = self._create_remote(includes=[], url=distro.base_url)
         repo2 = self._create_repo_and_sync_with_remote(remote)
-        self.assertEqual(get_content_summary(repo2.to_dict()), PYTHON_MD_FIXTURE_SUMMARY)
+        self.assertEqual(
+            get_content_summary(repo2.to_dict()), PYTHON_MD_FIXTURE_SUMMARY
+        )
 
         # Now test using publication simple pages
         pub = self._create_publication(repo)
         distro2 = self._create_distribution_from_publication(pub)
-        remote = self._create_remote(includes=[], url=distro2.base_url, prereleases=True)
+        remote = self._create_remote(
+            includes=[], url=distro2.base_url, prereleases=True
+        )
 
         repo3 = self._create_repo_and_sync_with_remote(remote)
-        self.assertEqual(get_content_summary(repo3.to_dict()), PYTHON_MD_FIXTURE_SUMMARY)
+        self.assertEqual(
+            get_content_summary(repo3.to_dict()), PYTHON_MD_FIXTURE_SUMMARY
+        )

pulp_python/tests/functional/constants.py

@@ -113,21 +113,15 @@
     "aiohttp-3.2.1.tar.gz": "1b95d53f8dac13898f0a3e4af76f6f36d540fbfaefc4f4c9f43e436fa0e53d22",
     "aiohttp-3.2.0.tar.gz": "1be3903fe6a36d20492e74efb326522dd4702bf32b45ffc7acbc0fb34ab240a6",
     "Django-1.10.4.tar.gz": "fff7f062e510d812badde7cfc57745b7779edb4d209b2bc5ea8d954c22305c2b",
-    "Django-1.10.4-py2.py3-none-any.whl":
-        "a8e1a552205cda15023c39ecf17f7e525e96c5b0142e7879e8bd0c445351f2cc",
+    "Django-1.10.4-py2.py3-none-any.whl": "a8e1a552205cda15023c39ecf17f7e525e96c5b0142e7879e8bd0c445351f2cc",
     "Django-1.10.3.tar.gz": "6f92f08dee8a1bd7680e098a91bf5acd08b5cdfe74137f695b60fd79f4478c30",
-    "Django-1.10.3-py2.py3-none-any.whl":
-        "94426cc28d8721fbf13c333053f08d32427671a4ca7986f7030fc82bdf9c88c1",
+    "Django-1.10.3-py2.py3-none-any.whl": "94426cc28d8721fbf13c333053f08d32427671a4ca7986f7030fc82bdf9c88c1",
     "Django-1.10.2.tar.gz": "e127f12a0bfb34843b6e8c82f91e26fff6445a7ca91d222c0794174cf97cbce1",
-    "Django-1.10.2-py2.py3-none-any.whl":
-        "4d48ab8e84a7c8b2bc4b2f4f199bc3a8bfcc9cbdbc29e355ac5c44a501d73a1a",
+    "Django-1.10.2-py2.py3-none-any.whl": "4d48ab8e84a7c8b2bc4b2f4f199bc3a8bfcc9cbdbc29e355ac5c44a501d73a1a",
     "Django-1.10.1.tar.gz": "d6e6c5b25cb67f46afd7c82f536529b11981183423dad8932e15bce93d1a24f3",
-    "Django-1.10.1-py2.py3-none-any.whl":
-        "3d689905cd0635bbb33b87f9a5df7ca70a3db206faae4ec58cda5e7f5f47050d",
-    "celery-4.2.0-py2.py3-none-any.whl":
-        "2082cbd82effa8ac8a8a58977d70bb203a9f362817e3b66f4578117b9f93d8a9",
-    "celery-4.1.1-py2.py3-none-any.whl":
-        "6fc4678d1692af97e137b2a9f1c04efd8e7e2fb7134c5c5ad60738cdd927762f",
+    "Django-1.10.1-py2.py3-none-any.whl": "3d689905cd0635bbb33b87f9a5df7ca70a3db206faae4ec58cda5e7f5f47050d",
+    "celery-4.2.0-py2.py3-none-any.whl": "2082cbd82effa8ac8a8a58977d70bb203a9f362817e3b66f4578117b9f93d8a9",
+    "celery-4.1.1-py2.py3-none-any.whl": "6fc4678d1692af97e137b2a9f1c04efd8e7e2fb7134c5c5ad60738cdd927762f",
 }
 
 PYTHON_MD_PROJECT_SPECIFIER = [
@@ -145,14 +139,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
@@ -241,11 +237,15 @@
     # "provides_dist": [],
     # "obsoletes_dist": [],
     # "requires_external": [],
-    "classifiers": ['Development Status :: 4 - Beta', 'Environment :: Console',
-                    'Intended Audience :: Developers',
-                    'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
-                    'Natural Language :: English', 'Programming Language :: Python :: 2',
-                    'Programming Language :: Python :: 2.7'],
+    "classifiers": [
+        "Development Status :: 4 - Beta",
+        "Environment :: Console",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
+        "Natural Language :: English",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+    ],
     "downloads": {"last_day": -1, "last_month": -1, "last_week": -1},
     # maybe add description, license is long for this one
 }
@@ -281,7 +281,7 @@
     "download_concurrency": 3,
     "policy": "on_demand",
     "prereleases": False,
-    "excludes": ["example1", "example2"]
+    "excludes": ["example1", "example2"],
 }
 
 BANDERSNATCH_CONF = b"""
@@ -345,7 +345,7 @@
     "requires_python": None,
     "size": 22455,
     "yanked": False,
-    "yanked_reason": None
+    "yanked_reason": None,
 }
 
 SHELF_SDIST_PYTHON_DOWNLOAD = {
@@ -363,17 +363,14 @@
     "requires_python": None,
     "size": 19097,
     "yanked": False,
-    "yanked_reason": None
+    "yanked_reason": None,
 }
 
 SHELF_0DOT1_RELEASE = [SHELF_BDIST_PYTHON_DOWNLOAD, SHELF_SDIST_PYTHON_DOWNLOAD]
 
 SHELF_PYTHON_JSON = {
     "info": PYTHON_INFO_DATA,
     "last_serial": 0,
-    "releases": {
-        "0.1": SHELF_0DOT1_RELEASE
-    },
-    "urls": SHELF_0DOT1_RELEASE
-
+    "releases": {"0.1": SHELF_0DOT1_RELEASE},
+    "urls": SHELF_0DOT1_RELEASE,
 }