Merge lp:~james-w/pkgme/enable-tests into lp:pkgme

[James Westby]

Have tarmac run the tests. Skip the debpython tests if it is missing.

Hi,

This is the change to enable the tests for pkgme in tarmac.

I went with disabling the tests using debpython if it's not
present. This isn't ideal, but I figured that testing
99% of the code in tarmac was better than testing 0%.

Thanks,

James

[Jonathan Lange (jml)]

Looks good to me.

You do have a repeated literal, the path to debpython in your diff is also, sort of, in distutils_command/pkgme_info. Since they both have FIXME comments, it's not such a big deal.

review: Approve

=== added directory 'pkgme/backends/dummy'
=== added file 'pkgme/backends/dummy/package_name'
--- pkgme/backends/dummy/package_name	1970-01-01 00:00:00 +0000
+++ pkgme/backends/dummy/package_name	2011-12-08 21:22:19 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "foo"

=== added file 'pkgme/backends/dummy/version'
--- pkgme/backends/dummy/version	1970-01-01 00:00:00 +0000
+++ pkgme/backends/dummy/version	2011-12-08 21:22:19 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "0.0.0"

=== added file 'pkgme/backends/dummy/want'
--- pkgme/backends/dummy/want	1970-01-01 00:00:00 +0000
+++ pkgme/backends/dummy/want	2011-12-08 21:22:19 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -e is_pkgme_test ]; then
+  echo 100
+else
+  echo 0
+fi

=== modified file 'pkgme/distutils_command/pkgme_info.py'
--- pkgme/distutils_command/pkgme_info.py	2011-07-11 15:58:53 +0000
+++ pkgme/distutils_command/pkgme_info.py	2011-12-08 21:22:19 +0000
@@ -3,10 +3,6 @@
 import sys
 import textwrap
 
-# FIXME: should avoid depending on this Debian-specific module
-sys.path.insert(1, "/usr/share/python")
-from debpython import pydist
-
 
 class pkgme_info(Command):
     """distutils command that yields packaging information.
@@ -88,6 +84,10 @@
     def get_build_depends(self):
         basics = "python-all, python-setuptools"
         if getattr(self.distribution, "install_requires", None) is not None:
+            # FIXME: should avoid depending on this Debian-specific module
+            sys.path.insert(1, "/usr/share/python")
+            from debpython import pydist
+
             for pkg in self.distribution.install_requires:
                 dep = pydist.guess_dependency(pkg)
                 if dep:

=== modified file 'pkgme/testing.py'
--- pkgme/testing.py	2011-10-31 16:12:58 +0000
+++ pkgme/testing.py	2011-12-08 21:22:19 +0000
@@ -314,6 +314,19 @@
             self.skipTest("'%s' not executable: %s" % (command_name, find_error))
 
 
+class PathRequiredTestCase(object):
+
+    def skipTestIfPathNotPresent(self, path):
+        """Skip the test if a particular path doesn't exist.
+
+        :param path: the path that must exist
+        :return: None
+        :raises: TestSkipped if path isn't present
+        """
+        if not os.path.exists(path):
+            self.skipTest("'%s' not present" % (path, ))
+
+
 class StaticLoaderFixture(Fixture):
     """Change the default loader to one that only loads the given backends."""
 

=== modified file 'pkgme/tests/test_distutils_command.py'
--- pkgme/tests/test_distutils_command.py	2011-07-15 09:22:47 +0000
+++ pkgme/tests/test_distutils_command.py	2011-12-08 21:22:19 +0000
@@ -5,10 +5,10 @@
 from testtools import TestCase
 
 from pkgme.distutils_command.pkgme_info import pkgme_info
-from pkgme.testing import TempdirFixture
-
-
-class pkgme_info_tests(TestCase, TestWithFixtures):
+from pkgme.testing import PathRequiredTestCase, TempdirFixture
+
+
+class pkgme_info_tests(TestCase, TestWithFixtures, PathRequiredTestCase):
 
     def test_interprets_pkgmeinfo(self):
         dist = Distribution()
@@ -124,6 +124,9 @@
         self.assertIn("python-setuptools", cmd.get_build_depends())
 
     def test_build_depends_examines_install_requires(self):
+        # FIXME: we shouldn't really be skipping here, it's a symptom
+        # of the fact that there are undocumented dependencies.
+        self.skipTestIfPathNotPresent("/usr/share/python/debpython")
         cmd = self.get_cmd_with_metadata({})
         cmd.distribution.install_requires = ["foo"]
         self.assertIn("python-foo", cmd.get_build_depends())

=== modified file 'pkgme/tests/test_script.py'
--- pkgme/tests/test_script.py	2011-07-29 17:18:19 +0000
+++ pkgme/tests/test_script.py	2011-12-08 21:22:19 +0000
@@ -1,3 +1,4 @@
+import os
 import pkg_resources
 from StringIO import StringIO
 
@@ -22,23 +23,22 @@
             ep(argv=[], target_dir=cwd, interactive=False)
         self.assertEqual('', stderr.getvalue())
 
+    def create_marker_file(self, tempdir, prefix=None):
+        """Create the file that triggers the dummy backend for testing."""
+        path = "is_pkgme_test"
+        if prefix is not None:
+            path = os.path.join(prefix, path)
+        tempdir.create_file(path, "")
+
     def test_writes_files(self):
         tempdir = self.useFixture(TempdirFixture())
-        tempdir.create_file(
-            "setup.py", """from distutils.core import setup
-
-setup(name="foo")
-""")
+        self.create_marker_file(tempdir)
         self.run_script(tempdir.path)
         self.assertThat(tempdir.abspath("debian"), DirExists())
 
     def test_builds_source_package(self):
         tempdir = self.useFixture(TempdirFixture())
-        tempdir.create_file(
-            "foo/setup.py", """from distutils.core import setup
-
-setup(name="foo")
-""")
+        self.create_marker_file(tempdir, prefix="foo")
         self.run_script(tempdir.abspath('foo'))
         self.assertThat(tempdir.path, DirContains(
             ["foo_0.0.0.tar.gz",

=== modified file 'tarmac_tests.sh'
--- tarmac_tests.sh	2011-12-07 20:02:49 +0000
+++ tarmac_tests.sh	2011-12-08 21:22:19 +0000
@@ -2,4 +2,7 @@
 
 set -e
 
-echo "No tests on merge yet."
+virtualenv --no-site-packages virtualenv > log
+. virtualenv/bin/activate >> log
+python setup.py develop >> log
+python -m testtools.run pkgme.tests.test_suite