Update the new docker tests

Do the following: * Make the new tests run only if Pulp 2.8 or above is targeted. * Add reStructuredText API documentation stubs. * Tweak some formatting. Test results: ============ ================== Pulp Version Test Suite Results ============ ================== 2.7 OK (skipped=1) dev (2.8) OK ============ ================== Command used to generate test results: PULP_SMASH_CONFIG_FILE=$PS_CONFIG \ python -m unittest2 pulp_smash.tests.docker.api_v2.test_crud
pulp · Dec 17, 2015 · 668f4b7 · 668f4b7
1 parent 129f682
commit 668f4b7
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/docs/api.rst b/docs/api.rst
@@ -14,6 +14,9 @@ developers, not a gospel.
     api/pulp_smash.config
     api/pulp_smash.constants
     api/pulp_smash.tests
+    api/pulp_smash.tests.docker
+    api/pulp_smash.tests.docker.api_v2
+    api/pulp_smash.tests.docker.api_v2.test_crud
     api/pulp_smash.tests.platform
     api/pulp_smash.tests.platform.api_v2
     api/pulp_smash.tests.platform.api_v2.test_content_applicability

diff --git a/docs/api/pulp_smash.tests.docker.api_v2.rst b/docs/api/pulp_smash.tests.docker.api_v2.rst
@@ -0,0 +1,6 @@
+`pulp_smash.tests.docker.api_v2`
+================================
+
+Location: :doc:`/index` → :doc:`/api` → :doc:`/api/pulp_smash.tests.docker.api_v2`
+
+.. automodule:: pulp_smash.tests.docker.api_v2
diff --git a/docs/api/pulp_smash.tests.docker.api_v2.test_crud.rst b/docs/api/pulp_smash.tests.docker.api_v2.test_crud.rst
@@ -0,0 +1,7 @@
+`pulp_smash.tests.docker.api_v2.test_crud`
+==========================================
+
+Location: :doc:`/index` → :doc:`/api` →
+:doc:`/api/pulp_smash.tests.docker.api_v2.test_crud`
+
+.. automodule:: pulp_smash.tests.docker.api_v2.test_crud
diff --git a/docs/api/pulp_smash.tests.docker.rst b/docs/api/pulp_smash.tests.docker.rst
@@ -0,0 +1,6 @@
+`pulp_smash.tests.docker`
+=========================
+
+Location: :doc:`/index` → :doc:`/api` → :doc:`/api/pulp_smash.tests.docker`
+
+.. automodule:: pulp_smash.tests.docker
diff --git a/pulp_smash/tests/docker/api_v2/test_crud.py b/pulp_smash/tests/docker/api_v2/test_crud.py
@@ -6,22 +6,23 @@
 
 """
 from __future__ import unicode_literals
-import unittest2
 
+import unittest2
+from packaging.version import Version
 from pulp_smash import config, utils
 
 
 def _gen_docker_repo_body():
     """Generate a Docker repo create body.
 
-    Return a semi-random dict that can be used to create a Docker
-    repository.
+    Return a semi-random dict that can be used to create a Docker repository.
 
     """
     return {
         'id': utils.uuid4(), 'importer_config': {},
         'importer_type_id': 'docker_importer',
-        'notes': {'_repo-type': 'docker-repo'}}
+        'notes': {'_repo-type': 'docker-repo'},
+    }
 
 
 class _BaseTestCase(unittest2.TestCase):
@@ -32,6 +33,8 @@ def setUpClass(cls):
         """Provide a server config and an iterable of resources to delete."""
         cls.cfg = config.get_config()
         cls.attrs_iter = tuple()
+        if cls.cfg.version < Version('2.8'):
+            raise unittest2.SkipTest('These tests require at least Pulp 2.8.')
 
     @classmethod
     def tearDownClass(cls):