Fix tests for initial repo version

ref #5757 (cherry picked from commit 2f91b29)
pulp · Nov 27, 2019 · a995088 · a995088
1 parent e896186
commit a995088
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/CHANGES/5757.misc b/CHANGES/5757.misc
@@ -0,0 +1 @@
+Fix tests for initial repo version change
diff --git a/pulp_rpm/tests/functional/api/test_character_encoding.py b/pulp_rpm/tests/functional/api/test_character_encoding.py
@@ -55,13 +55,13 @@ def test_upload_non_ascii(self):
         repo = self.client.post(RPM_REPO_PATH, gen_repo())
         self.addCleanup(self.client.delete, repo['pulp_href'])
         repo_versions = get_versions(repo)
-        self.assertEqual(len(repo_versions), 0, repo_versions)
+        self.assertEqual(len(repo_versions), 1, repo_versions)
         self.client.post(
             urljoin(repo['pulp_href'], 'modify/'),
             {'add_content_units': [content_unit['pulp_href']]}
         )
         repo_versions = get_versions(repo)
-        self.assertEqual(len(repo_versions), 1, repo_versions)
+        self.assertEqual(len(repo_versions), 2, repo_versions)
 
     def test_upload_non_utf8(self):
         """Test whether an exception is raised when non-utf-8 is uploaded."""

diff --git a/pulp_rpm/tests/functional/api/test_download_policies.py b/pulp_rpm/tests/functional/api/test_download_policies.py
@@ -82,7 +82,7 @@ def do_sync(self, download_policy):
         self.addCleanup(self.client.delete, remote['pulp_href'])
 
         # Sync the repository.
-        self.assertIsNone(repo['latest_version_href'])
+        self.assertEqual(repo["latest_version_href"], f"{repo['pulp_href']}versions/0/")
         sync(self.cfg, remote, repo)
         repo = self.client.get(repo['pulp_href'])
 

diff --git a/pulp_rpm/tests/functional/api/test_sync.py b/pulp_rpm/tests/functional/api/test_sync.py
@@ -79,7 +79,7 @@ def test_rpm(self):
         self.addCleanup(self.client.delete, remote['pulp_href'])
 
         # Sync the repository.
-        self.assertIsNone(repo['latest_version_href'])
+        self.assertEqual(repo["latest_version_href"], f"{repo['pulp_href']}versions/0/")
         sync(self.cfg, remote, repo)
         repo = self.client.get(repo['pulp_href'])
 
@@ -143,7 +143,7 @@ def test_rpm_kickstart(self):
         self.addCleanup(self.client.delete, remote['pulp_href'])
 
         # Sync the repository.
-        self.assertIsNone(repo['latest_version_href'])
+        self.assertEqual(repo["latest_version_href"], f"{repo['pulp_href']}versions/0/")
         sync(self.cfg, remote, repo)
         repo = self.client.get(repo['pulp_href'])
         for kickstart_content in get_content(repo)[RPM_KICKSTART_CONTENT_NAME]:
@@ -209,7 +209,7 @@ def test_rpm_kickstart_on_demand(self):
         self.addCleanup(self.client.delete, remote['pulp_href'])
 
         # Sync the repository.
-        self.assertIsNone(repo['latest_version_href'])
+        self.assertEqual(repo["latest_version_href"], f"{repo['pulp_href']}versions/0/")
         sync(self.cfg, remote, repo)
         repo = self.client.get(repo['pulp_href'])
         for kickstart_content in get_content(repo)[RPM_KICKSTART_CONTENT_NAME]:
@@ -314,7 +314,7 @@ def test_all(self):
         self.addCleanup(self.client.delete, remote['pulp_href'])
 
         # Sync the repository.
-        self.assertIsNone(repo['latest_version_href'])
+        self.assertEqual(repo["latest_version_href"], f"{repo['pulp_href']}versions/0/")
         sync(self.cfg, remote, repo)
         repo = self.client.get(repo['pulp_href'])
         self.assertDictEqual(get_content_summary(repo), RPM_FIXTURE_SUMMARY)
@@ -397,7 +397,7 @@ def test_sync_large_repo(self):
         self.addCleanup(client.delete, remote['pulp_href'])
 
         # Sync the repository.
-        self.assertIsNone(repo['latest_version_href'])
+        self.assertEqual(repo["latest_version_href"], f"{repo['pulp_href']}versions/0/")
         sync(cfg, remote, repo)
         repo = client.get(repo['pulp_href'])
         content_summary = get_content_summary(repo)
@@ -449,7 +449,7 @@ def test_all(self):
         self.addCleanup(client.delete, remote['pulp_href'])
 
         # Sync the repository.
-        self.assertIsNone(repo['latest_version_href'])
+        self.assertEqual(repo["latest_version_href"], f"{repo['pulp_href']}versions/0/")
         sync(self.cfg, remote, repo)
         repo = client.get(repo['pulp_href'])
         self.assertDictEqual(get_content_summary(repo), RPM_FIXTURE_SUMMARY)

diff --git a/pulp_rpm/tests/performance/test_sync.py b/pulp_rpm/tests/performance/test_sync.py
@@ -77,7 +77,7 @@ def rpm_sync(self, url=RPM_KICKSTART_FIXTURE_URL, policy='on_demand'):
         self.addCleanup(self.client.delete, remote['pulp_href'])
 
         # Sync the repository.
-        self.assertIsNone(repo['latest_version_href'])
+        self.assertEqual(repo["latest_version_href"], f"{repo['pulp_href']}versions/0/")
         data = {"remote": remote["pulp_href"]}
         response = self.client.using_handler(api.json_handler).post(
             urljoin(repo["pulp_href"], "sync/"), data