Merge lp:~barry/pkgme/test-fixes into lp:pkgme

[Barry Warsaw]

This fixes all the tests for me.

[James Westby (james-w)]

80 + def __repr__(self):
81 + return '<TempdirFixture: {0}'.format(self.path)
82 +

Missing ">"?

92 +def command_exists(command_name):
93 + try:
94 + subprocess.call(command_name)
95 + except OSError:
96 + # Assume command not found.
97 + return False
98 + else:
99 + return True

Could we have this be a str(e)/None interface or similar? That way we can include the reason in the skip message, and people won't be confused when it is saying that vala-dep-scanner isn't installed when it's just not executable or something.

105 -import unittest
106 -
107 -def test_suite():
108 - module_names = [
109 - 'pkgme.tests.test_backend',
110 - 'pkgme.tests.test_distutils_command',
111 - 'pkgme.tests.test_info_elements',
112 - 'pkgme.tests.test_package_files',
113 - 'pkgme.tests.test_project_info',
114 - 'pkgme.tests.test_python_backend',
115 - 'pkgme.tests.test_script',
116 - 'pkgme.tests.test_template_file',
117 - 'pkgme.tests.test_vala_backend',
118 - 'pkgme.tests.test_write',
119 - 'pkgme.tests.test_write_packaging',
120 - ]
121 - loader = unittest.TestLoader()
122 - suite = loader.loadTestsFromNames(module_names)
123 - return suite

Can we keep this? I use testr to run the tests, and I don't think there's
a way to get subunit output from "setup.py test"?

Otherwise this change looks good to me.

Thanks,

James

review: Approve

[Barry Warsaw (barry)]

On Dec 18, 2010, at 01:23 AM, James Westby wrote:

>Review: Approve
>80 + def __repr__(self):
>81 + return '<TempdirFixture: {0}'.format(self.path)
>82 +
>
>Missing ">"?

Yep, thanks.

>
>92 +def command_exists(command_name):
>93 + try:
>94 + subprocess.call(command_name)
>95 + except OSError:
>96 + # Assume command not found.
>97 + return False
>98 + else:
>99 + return True
>
>Could we have this be a str(e)/None interface or similar? That way we can include the reason in the skip message, and people won't be confused when it is saying that vala-dep-scanner isn't installed when it's just not executable or something.

Good idea.

>105 -import unittest
>106 -
>107 -def test_suite():
>108 - module_names = [
>109 - 'pkgme.tests.test_backend',
>110 - 'pkgme.tests.test_distutils_command',
>111 - 'pkgme.tests.test_info_elements',
>112 - 'pkgme.tests.test_package_files',
>113 - 'pkgme.tests.test_project_info',
>114 - 'pkgme.tests.test_python_backend',
>115 - 'pkgme.tests.test_script',
>116 - 'pkgme.tests.test_template_file',
>117 - 'pkgme.tests.test_vala_backend',
>118 - 'pkgme.tests.test_write',
>119 - 'pkgme.tests.test_write_packaging',
>120 - ]
>121 - loader = unittest.TestLoader()
>122 - suite = loader.loadTestsFromNames(module_names)
>123 - return suite
>
>Can we keep this? I use testr to run the tests, and I don't think there's
>a way to get subunit output from "setup.py test"?

We can keep it, but I'll add a note that it is ignored by 'setup.py test'. I
don't know much about hooking up subunit to that. I'll try to investigate a
little bit.

>Otherwise this change looks good to me.

Thanks.

=== removed directory 'bin'
=== modified file 'pkgme/backend.py'
--- pkgme/backend.py	2010-12-13 01:34:21 +0000
+++ pkgme/backend.py	2010-12-18 01:04:12 +0000
@@ -1,6 +1,13 @@
 import os
+import sys
 import subprocess
 
+try:
+    from sysconfig import get_platform
+except ImportError:
+    # Python < 2.7
+    from distutils.util import get_platform
+
 from pkgme.project_info import (
     ExternalHelperFailed,
     MultipleExternalHelpersInfo,
@@ -9,10 +16,40 @@
 
 
 EXTERNAL_BACKEND_PATHS = ["/usr/share/pkgme/backends/"]
-root_dir = os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), os.pardir)
-if os.path.exists(os.path.join(root_dir, "setup.py")):
-    EXTERNAL_BACKEND_PATHS.insert(0, os.path.join(root_dir, "pkgme", "backends"))
+
+
+def get_backend_dir(underunder_file, backend):
+    backend_dir = os.path.normpath(
+        os.path.join(
+            os.path.dirname(underunder_file), os.pardir,
+            'backends', backend))
+    # When 'python setup.py test' is run with virtualenv, backend_dir will not
+    # point to the right place.  It will point into the
+    # build/lib.{platform}-{version} directory and that cannot be used as a
+    # landmark to find the backends directory.  Assuming we're running the
+    # tests from the top of the tree, we do the best we can to find the actual
+    # landmark.
+    parts = backend_dir.split(os.sep)
+    try:
+        i = parts.index('build')
+        # Stolen from site.py's addbuilddir().
+        s = 'lib.%s-%.3s' % (get_platform(), sys.version)
+        if hasattr(sys, 'gettotalrefcount'):
+            s += '-pydebug'
+        if parts[i + 1] == s:
+            del parts[i:i+2]
+        backend_dir = os.sep.join(parts)
+    except (ValueError, IndexError):
+        # We're (probably) not in the build environment.
+        pass
+    return backend_dir
+
+
+root_dir = os.path.dirname(get_backend_dir(__file__, ''))
+
+if os.path.exists(os.path.join(root_dir, 'setup.py')):
+    EXTERNAL_BACKEND_PATHS.insert(
+        0, os.path.join(root_dir, 'pkgme', 'backends'))
 
 
 def get_info_for(path, loader=None, selector_cls=None):

=== modified file 'pkgme/testing.py'
--- pkgme/testing.py	2010-11-09 19:49:39 +0000
+++ pkgme/testing.py	2010-12-18 01:04:12 +0000
@@ -1,6 +1,7 @@
 import os
 import shutil
 import tempfile
+import subprocess
 
 from debian import deb822
 from fixtures import Fixture
@@ -78,6 +79,9 @@
         self.path = tempfile.mkdtemp(prefix="pkgme-tests-")
         self.addCleanup(shutil.rmtree, self.path)
 
+    def __repr__(self):
+        return '<TempdirFixture: {0}'.format(self.path)
+
 
 class ExecutableFileFixture(Fixture):
 
@@ -185,3 +189,13 @@
 
     def describe(self):
         return "Has key %s" % self.key
+
+
+def command_exists(command_name):
+    try:
+        subprocess.call(command_name)
+    except OSError:
+        # Assume command not found.
+        return False
+    else:
+        return True

=== modified file 'pkgme/tests/__init__.py'
--- pkgme/tests/__init__.py	2010-11-13 02:54:02 +0000
+++ pkgme/tests/__init__.py	2010-12-18 01:04:12 +0000
@@ -1,19 +0,0 @@
-import unittest
-
-def test_suite():
-    module_names = [
-        'pkgme.tests.test_backend',
-        'pkgme.tests.test_distutils_command',
-        'pkgme.tests.test_info_elements',
-        'pkgme.tests.test_package_files',
-        'pkgme.tests.test_project_info',
-        'pkgme.tests.test_python_backend',
-        'pkgme.tests.test_script',
-        'pkgme.tests.test_template_file',
-        'pkgme.tests.test_vala_backend',
-        'pkgme.tests.test_write',
-        'pkgme.tests.test_write_packaging',
-        ]
-    loader = unittest.TestLoader()
-    suite = loader.loadTestsFromNames(module_names)
-    return suite

=== modified file 'pkgme/tests/test_python_backend.py'
--- pkgme/tests/test_python_backend.py	2010-11-10 21:53:56 +0000
+++ pkgme/tests/test_python_backend.py	2010-12-18 01:04:12 +0000
@@ -3,13 +3,11 @@
 from fixtures import TestWithFixtures
 from testtools import TestCase
 
-from pkgme.backend import ExternalHelpersBackend
+from pkgme.backend import ExternalHelpersBackend, get_backend_dir
 from pkgme.testing import TempdirFixture
 
 
-backend_dir = os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), os.pardir,
-    "backends", "python")
+backend_dir = get_backend_dir(__file__, 'python')
 
 
 class PythonBackendTests(TestCase, TestWithFixtures):

=== modified file 'pkgme/tests/test_vala_backend.py'
--- pkgme/tests/test_vala_backend.py	2010-11-30 14:49:35 +0000
+++ pkgme/tests/test_vala_backend.py	2010-12-18 01:04:12 +0000
@@ -23,14 +23,12 @@
 from fixtures import TestWithFixtures
 from testtools import TestCase
 
-from pkgme.backend import ExternalHelpersBackend
-from pkgme.testing import TempdirFixture
+from pkgme.backend import ExternalHelpersBackend, get_backend_dir
+from pkgme.testing import TempdirFixture, command_exists
 from pkgme.write import write_file
 
 
-backend_dir = os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), os.pardir,
-    "backends", "vala")
+backend_dir = get_backend_dir(__file__, 'vala')
 
 
 class PythonBackendTests(TestCase, TestWithFixtures):
@@ -90,6 +88,8 @@
             {"buildsystem": "autoconf"}, info.get_all(["buildsystem"]))
 
     def test_build_depends(self):
+        if not command_exists('vala-dep-scanner'):
+            self.skipTest('vala-dep-scanner is missing')
         self.write_file_in_tempdir("main.vala", "Gtk.Window win;")
         info = self.get_info()
         self.assertEqual(

=== modified file 'setup.py'
--- setup.py	2010-12-08 02:00:29 +0000
+++ setup.py	2010-12-18 01:04:12 +0000
@@ -47,6 +47,7 @@
         'argparse',
         'cheetah',
         'fixtures',
+        'testtools',
         ],
     entry_points = {
         'console_scripts': ['pkgme=pkgme.bin.main:main'],