Merge lp:~cjwatson/click/fix-tests-installation into lp:click

[Colin Watson]

Move integration tests to a location where they won't end up being installed into inappropriate places on the system module path (LP: #1337696).

The integration tests are being installed to /usr/lib/python3/dist-packages/tests/, which is clearly wrong. I moved them into click.tests to fix this, and put some additional arrangements in place so that they aren't run as part of unit tests.

This made the integration tests visible to pyflakes/pep8, which necessitated some follow-up tweaks.

[lp:~cjwatson/click/fix-tests-installation]

494. By Colin Watson on 2014-07-09

Hack around unittest.skipIf decorator ordering, which caused some bits of the integration test framework to try to run without sufficient dependencies installed.

495. By Colin Watson on 2014-07-09

Don't fail if ping does not exist (as when running the unit tests in an environment without sufficient dependencies to run the integration tests).

496. By Colin Watson on 2014-09-04

merge trunk

497. By Colin Watson on 2014-09-04

More PEP-8 failures.

498. By Colin Watson on 2014-09-04

Call skipTest in ClickTestCase.setUp rather than using allow_integration helper everywhere.

499. By Colin Watson on 2014-09-04

Use is_root helper in another place.

500. By Colin Watson on 2014-09-04

Rearrange integration test skip logic to do everything in setUpClass rather than via decorators, for clarity of ordering.

Unmerged revisions

=== renamed directory 'tests/integration' => 'click/tests/integration'
=== modified file 'click/tests/integration/helpers.py'
--- tests/integration/helpers.py	2014-07-03 12:55:50 +0000
+++ click/tests/integration/helpers.py	2014-07-09 08:28:28 +0000
@@ -22,7 +22,6 @@
 import random
 import shutil
 import string
-import shutil
 import subprocess
 import tempfile
 import unittest
@@ -46,6 +45,8 @@
         os.chdir(curdir)
 
 
[e-mail](
+    "TEST_INTEGRATION" in os.environ, "Skipping integration tests")
 class ClickTestCase(unittest.TestCase):
 
     @classmethod
 
=== modified file 'click/tests/integration/test_build_core_apps.py'
--- tests/integration/test_build_core_apps.py	2014-07-02 18:21:32 +0000
+++ click/tests/integration/test_build_core_apps.py	2014-07-09 08:28:28 +0000
@@ -22,6 +22,8 @@
 import subprocess
 import unittest
 
+from six import with_metaclass
+
 from .helpers import (
     chdir,
     has_network,
@@ -65,7 +67,7 @@
 
 @unittest.skipIf(not is_root(), "This tests needs to run as root")
 @unittest.skipIf(not has_network(), "Need network")
-class TestBuildCoreApps(ClickTestCase, metaclass=AddBranchTestFunctions):
+class TestBuildCoreApps(with_metaclass(AddBranchTestFunctions, ClickTestCase)):
 
     def _run_in_chroot(self, cmd):
         """Run the given cmd in a click chroot"""
@@ -117,6 +119,3 @@
                 self.configure()
                 self.make()
                 self.create_click()
-                
-
-                
 
=== modified file 'click/tests/integration/test_hook.py'
--- tests/integration/test_hook.py	2014-07-04 14:35:59 +0000
+++ click/tests/integration/test_hook.py	2014-07-09 08:28:28 +0000
@@ -55,7 +55,7 @@
         subprocess.check_call(
             [self.click_binary, "hook", "install", hook_name])
         self.addCleanup(
-            subprocess.check_call, [self.click_binary, "hook", "remove", 
+            subprocess.check_call, [self.click_binary, "hook", "remove",
                                     hook_name])
         # make click that uses the hook
         hooks = {'app1' : {hook_name: 'README'}}
@@ -67,7 +67,7 @@
             self.click_binary, "install", "--user=%s" % user, click_pkg],
                               universal_newlines=True)
         self.addCleanup(
-            subprocess.check_call, 
+            subprocess.check_call,
             [self.click_binary, "unregister","--user=%s" % user,
              click_pkg_name])
         # ensure we have the hook
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-07-04 15:10:01 +0000
+++ debian/changelog	2014-07-09 08:28:28 +0000
@@ -1,3 +1,13 @@
+click (0.4.30) UNRELEASED; urgency=medium
+
+  * Move integration tests to a location where they won't end up being
+    installed into inappropriate places on the system module path
+    (LP: #1337696).
+  * Use six.with_metaclass for TestBuildCoreApps, so that it doesn't make
+    pyflakes angry when running tests under Python 2.
+
+ -- Colin Watson <[e-mail]>  Tue, 08 Jul 2014 12:58:05 +0100
+
 click (0.4.29.1) utopic; urgency=medium
 
   [ Michael Vogt ]
 
=== modified file 'debian/control'
--- debian/control	2014-06-10 17:18:00 +0000
+++ debian/control	2014-07-09 08:28:28 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Colin Watson <[e-mail]>
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9~), dh-autoreconf, intltool, python3:any (>= 3.2), python3-all:any, python3-setuptools, python3-apt, python3-debian, python3-gi, python3:any (>= 3.3) | python3-mock, pep8, python3-pep8, pyflakes, python3-sphinx, pkg-config, valac, gobject-introspection (>= 0.6.7), libgirepository1.0-dev (>= 0.6.7), libglib2.0-dev (>= 2.34), gir1.2-glib-2.0, libjson-glib-dev (>= 0.10), libgee-0.8-dev, libpackagekit-glib2-dev (>= 0.7.2), python3-coverage
+Build-Depends: debhelper (>= 9~), dh-autoreconf, intltool, python3:any (>= 3.2), python3-all:any, python3-setuptools, python3-apt, python3-debian, python3-gi, python3:any (>= 3.3) | python3-mock, pep8, python3-pep8, pyflakes, python3-sphinx, pkg-config, valac, gobject-introspection (>= 0.6.7), libgirepository1.0-dev (>= 0.6.7), libglib2.0-dev (>= 2.34), gir1.2-glib-2.0, libjson-glib-dev (>= 0.10), libgee-0.8-dev, libpackagekit-glib2-dev (>= 0.7.2), python3-coverage, python3-six
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-managed-branches/click/click
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-managed-branches/click/click/files
 X-Auto-Uploader: no-rewrite-version
 
=== modified file 'debian/tests/control'
--- debian/tests/control	2014-06-30 14:03:36 +0000
+++ debian/tests/control	2014-07-09 08:28:28 +0000
@@ -1,3 +1,3 @@
 Tests: run-tests.sh
-Depends: @, iputils-ping, click-dev, schroot, debootstrap, sudo, bzr
+Depends: @, iputils-ping, click-dev, schroot, debootstrap, sudo, bzr, python3-six
 Restrictions: needs-root allow-stderr
 
=== modified file 'debian/tests/run-tests.sh'
--- debian/tests/run-tests.sh	2014-06-11 12:40:44 +0000
+++ debian/tests/run-tests.sh	2014-07-09 08:28:28 +0000
@@ -2,4 +2,4 @@
 
 set -e
 
-python3 -m unittest discover tests.integration
+TEST_INTEGRATION=1 python3 -m unittest discover -vv click.tests.integration
 
=== removed directory 'tests'
=== removed file 'tests/__init__.py'