Merge pull request #209 from dralley/master

Update smash tests

Author: dralley

pulp_python/tests/functional/api/test_crud_content_unit.py

@@ -1,28 +1,13 @@
-from random import choice
 import unittest
 
 from requests.exceptions import HTTPError
 
 from pulp_smash import api, config, utils
-from pulp_smash.pulp3.constants import ARTIFACTS_PATH, REPO_PATH
-from pulp_smash.pulp3.utils import (
-    delete_orphans,
-    gen_repo,
-    get_content,
-    sync,
-)
-
-from pulp_python.tests.functional.constants import (
-    PYTHON_CONTENT_PATH,
-    PYTHON_FIXTURES_URL,
-    PYTHON_REMOTE_PATH,
-    PYTHON_WHEEL_URL,
-)
-from pulp_python.tests.functional.utils import (
-    gen_python_package_attrs,
-    gen_python_remote,
-    skip_if
-)
+from pulp_smash.pulp3.constants import ARTIFACTS_PATH
+from pulp_smash.pulp3.utils import delete_orphans
+
+from pulp_python.tests.functional.constants import PYTHON_CONTENT_PATH, PYTHON_WHEEL_URL
+from pulp_python.tests.functional.utils import gen_python_package_attrs, skip_if
 from pulp_python.tests.functional.utils import set_up_module as setUpModule  # noqa:F401
 
 
@@ -33,6 +18,7 @@ class ContentUnitTestCase(unittest.TestCase):
     This test targets the following issues:
 
     * `Pulp #2872 <https://pulp.plan.io/issues/2872>`_
+    * `Pulp #3445 <https://pulp.plan.io/issues/3445>`_
     * `Pulp Smash #870 <https://github.com/PulpQE/pulp-smash/issues/870>`_
     """
 
@@ -97,8 +83,9 @@ def test_03_partially_update(self):
 
         """
         attrs = gen_python_package_attrs(self.artifact)
-        with self.assertRaises(HTTPError):
+        with self.assertRaises(HTTPError) as exc:
             self.client.patch(self.content_unit['_href'], attrs)
+        self.assertEqual(exc.exception.response.status_code, 405)
 
     @skip_if(bool, 'content_unit', False)
     def test_03_fully_update(self):
@@ -109,47 +96,16 @@ def test_03_fully_update(self):
 
         """
         attrs = gen_python_package_attrs(self.artifact)
-        with self.assertRaises(HTTPError):
+        with self.assertRaises(HTTPError) as exc:
             self.client.put(self.content_unit['_href'], attrs)
+        self.assertEqual(exc.exception.response.status_code, 405)
 
+    @skip_if(bool, 'content_unit', False)
+    def test_04_delete(self):
+        """Attempt to delete a content unit using HTTP DELETE.
 
-class DeleteContentUnitRepoVersionTestCase(unittest.TestCase):
-    """
-    Test whether content unit used by a repo version can be deleted.
-
-    This test targets the following issues:
-
-    * `Pulp #3418 <https://pulp.plan.io/issues/3418>`_
-    * `Pulp Smash #900 <https://github.com/PulpQE/pulp-smash/issues/900>`_
-    """
-
-    def test_all(self):
-        """
-        Test whether content unit used by a repo version can be deleted.
-
-        Do the following:
-
-        1. Sync content to a repository.
-        2. Attempt to delete a content unit present in a repository version.
-           Assert that a HTTP exception was raised.
-        3. Assert that number of content units present on the repository
-           does not change after the attempt to delete one content unit.
-
+        This HTTP method is not supported and a HTTP exception is expected.
         """
-        cfg = config.get_config()
-        client = api.Client(cfg, api.json_handler)
-
-        body = gen_python_remote(PYTHON_FIXTURES_URL)
-        remote = client.post(PYTHON_REMOTE_PATH, body)
-        self.addCleanup(client.delete, remote['_href'])
-
-        repo = client.post(REPO_PATH, gen_repo())
-        self.addCleanup(client.delete, repo['_href'])
-
-        sync(cfg, remote, repo)
-
-        repo = client.get(repo['_href'])
-        content = get_content(repo)
-        with self.assertRaises(HTTPError):
-            client.delete(choice(content)['_href'])
-        self.assertEqual(len(content), len(get_content(repo)))
+        with self.assertRaises(HTTPError) as exc:
+            self.client.delete(self.content_unit['_href'])
+        self.assertEqual(exc.exception.response.status_code, 405)

pulp_python/tests/functional/api/test_sync.py

@@ -1,6 +1,6 @@
 import unittest
-from pulp_smash import api, config, exceptions
-from pulp_smash.pulp3.constants import REPO_PATH
+from pulp_smash import api, cli, config, exceptions
+from pulp_smash.pulp3.constants import MEDIA_PATH, REPO_PATH
 from pulp_smash.pulp3.utils import (
     gen_repo,
     get_added_content,
@@ -85,6 +85,37 @@ def test_sync(self):
         self.assertEqual(len(get_content(repo)), PYTHON_XS_PACKAGE_COUNT)
         self.assertEqual(len(get_added_content(repo)), 0)
 
+    def test_file_decriptors(self):
+        """Test whether file descriptors are closed properly.
+
+        This test targets the following issue:
+        `Pulp #4073 <https://pulp.plan.io/issues/4073>`_
+
+        Do the following:
+        1. Check if 'lsof' is installed. If it is not, skip this test.
+        2. Create and sync a repo.
+        3. Run the 'lsof' command to verify that files in the
+           path ``/var/lib/pulp/`` are closed after the sync.
+        4. Assert that issued command returns `0` opened files.
+        """
+        cli_client = cli.Client(self.cfg, cli.echo_handler)
+
+        # check if 'lsof' is available
+        if cli_client.run(('which', 'lsof')).returncode != 0:
+            raise unittest.SkipTest('lsof package is not present')
+
+        repo = self.client.post(REPO_PATH, gen_repo())
+        self.addCleanup(self.client.delete, repo['_href'])
+
+        remote = self.client.post(PYTHON_REMOTE_PATH, gen_python_remote())
+        self.addCleanup(self.client.delete, remote['_href'])
+
+        sync(self.cfg, remote, repo)
+
+        cmd = 'lsof -t +D {}'.format(MEDIA_PATH).split()
+        response = cli_client.run(cmd).stdout
+        self.assertEqual(len(response), 0, response)
+
 
 class SyncInvalidURLTestCase(unittest.TestCase):
     """Sync a repository with an invalid url on the Remote."""

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 requirements = [
-    'pulpcore-plugin',
+    'pulpcore-plugin==0.1.0b13',
     'pkginfo',
     'packaging',
 ]