Adapt to Master/Detail Distribution change

Required PR: pulp/pulpcore#117 Required PR: pulp/pulpcore-plugin#95 Required PR: pulp/pulp_file#217 Required PR: pulp/pulp-smash#1205 ref #4785 https://pulp.plan.io/issues/4785
pulp · May 8, 2019 · 34f7203 · 34f7203
1 parent 0971bd8
commit 34f7203
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/pulp_certguard/tests/functional/api/test_certguard.py b/pulp_certguard/tests/functional/api/test_certguard.py
@@ -3,7 +3,6 @@
 from requests import HTTPError
 from pulp_smash import api, config, utils
 from pulp_smash.pulp3.constants import (
-    DISTRIBUTION_PATH,
     REPO_PATH,
 )
 from pulp_smash.pulp3.utils import (
@@ -16,6 +15,7 @@
     CERT_CA_FILE_PATH,
     CERT_CLIENT_FILE_PATH,
     X509_CONTENT_GUARD_PATH,
+    FILE_DISTRIBUTION_PATH,
     FILE_REMOTE_PATH,
     FILE_PUBLISHER_PATH
 )
@@ -99,7 +99,7 @@ def test_negative_download_protected_content_without_keys(self):
         """
         # Create a protected distribution
         distribution = self.client.using_handler(api.task_handler).post(
-            DISTRIBUTION_PATH,
+            FILE_DISTRIBUTION_PATH,
             gen_distribution(
                 publication=self.publication['_href'],
                 content_guard=self.certguard['_href']
@@ -122,7 +122,7 @@ def test_positive_download_protected_content_with_keys(self):
         """
         # Create a protected distribution
         distribution = self.client.using_handler(api.task_handler).post(
-            DISTRIBUTION_PATH,
+            FILE_DISTRIBUTION_PATH,
             gen_distribution(
                 publication=self.publication['_href'],
                 content_guard=self.certguard['_href']
@@ -152,7 +152,7 @@ def test_positive_add_contentguard_to_existing_distribution(self):
         """
         # 1 unprotected distribution
         distribution = self.client.using_handler(api.task_handler).post(
-            DISTRIBUTION_PATH,
+            FILE_DISTRIBUTION_PATH,
             gen_distribution(publication=self.publication['_href'])
         )
         self.addCleanup(self.client.delete, distribution['_href'])
@@ -191,7 +191,7 @@ def test_positive_remove_contentguard(self):
         """
         # Create a protected distribution
         distribution = self.client.using_handler(api.task_handler).post(
-            DISTRIBUTION_PATH,
+            FILE_DISTRIBUTION_PATH,
             gen_distribution(
                 publication=self.publication['_href'],
                 content_guard=self.certguard['_href']

diff --git a/pulp_certguard/tests/functional/constants.py b/pulp_certguard/tests/functional/constants.py
@@ -3,7 +3,11 @@
 from urllib.parse import urljoin
 
 from pulp_smash.pulp3.constants import BASE_PATH, BASE_CONTENT_GUARDS_PATH  # noqa:F401
-from pulp_file.tests.functional.constants import FILE_REMOTE_PATH, FILE_PUBLISHER_PATH  # noqa:F401
+from pulp_file.tests.functional.constants import (  # noqa:F401
+    FILE_REMOTE_PATH,
+    FILE_DISTRIBUTION_PATH,
+    FILE_PUBLISHER_PATH
+)
 
 _CURRENT_DIR = os.path.dirname(os.path.realpath(__file__))
 CERTS_BASE_PATH = os.path.join(