Merge lp:~dobey/dirspec/no-twisted into lp:dirspec

[dobey]

Stop using twisted trial as the test runner and as the base test case
Use setuptools test runner support to run the tests
Use testtools.testcase as the base test case

[Roberto Alsina (ralsina)]

review: Approve (code review)

[Brian Curtin (brian.curtin)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/dirspec/no-twisted into lp:dirspec failed. Below is the output from the failed tests.

running build
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/dirspec
copying dirspec/basedir.py -> build/lib.linux-x86_64-2.7/dirspec
copying dirspec/__init__.py -> build/lib.linux-x86_64-2.7/dirspec
copying dirspec/utils.py -> build/lib.linux-x86_64-2.7/dirspec
running test
running egg_info
creating dirspec.egg-info
writing dirspec.egg-info/PKG-INFO
writing top-level names to dirspec.egg-info/top_level.txt
writing dependency_links to dirspec.egg-info/dependency_links.txt
writing manifest file 'dirspec.egg-info/SOURCES.txt'
reading manifest file 'dirspec.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'dirspec.egg-info/SOURCES.txt'
running build_ext

+ python ./setup.py build test clean
test_cache_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_cache_home ... ok
test_config_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_config_dirs ... ok
test_config_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_config_home ... ok
test_data_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_data_dirs ... ok
test_data_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_data_home ... ok
test_default_cache_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_cache_home ... ok
test_default_config_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_config_dirs ... ok
test_default_config_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_config_home ... ok
test_default_data_dirs (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_data_dirs ... ok
test_default_data_home (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_default_data_home ... ok
test_load_config_paths_filter (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_load_config_paths_filter ... ok
test_save_config_path (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_save_config_path ... ok
test_xdg_cache_home_is_utf8_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_cache_home_is_utf8_bytes ... ok
test_xdg_config_dirs_are_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_config_dirs_are_bytes ... ok
test_xdg_config_home_is_utf8_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_config_home_is_utf8_bytes ... ok
test_xdg_data_dirs_are_bytes (dirspec.tests.test_basedir.BasedirTestCase)
dirspec.tests.test_basedir.BasedirTestCase.test_xdg_data_dirs_are_bytes ... ok
test_xdg_da...

=== modified file 'dirspec/tests/__init__.py'
--- dirspec/tests/__init__.py	2011-12-17 00:46:26 +0000
+++ dirspec/tests/__init__.py	2012-07-12 19:13:36 +0000
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """"dirspec tests."""
 
-from twisted.trial.unittest import TestCase
+from testtools.testcase import TestCase
 
 
 class BaseTestCase(TestCase):

=== modified file 'dirspec/tests/test_utils.py'
--- dirspec/tests/test_utils.py	2012-07-11 14:55:08 +0000
+++ dirspec/tests/test_utils.py	2012-07-12 19:13:36 +0000
@@ -17,12 +17,11 @@
 import os
 import sys
 
-from twisted.trial.unittest import TestCase
-
 from dirspec import basedir, utils as dirutils
 from dirspec.utils import (get_env_path, get_special_folders,
                            user_home, get_program_path)
 from dirspec.tests import BaseTestCase
+from testtools.testcase import skip
 
 
 class UtilsTestCase(BaseTestCase):
@@ -66,6 +65,9 @@
 
     def test_get_special_folders(self):
         """Make sure we can import the platform module."""
+        if sys.platform != 'win32':
+            self.skipTest('Win32 is required for this test.')
+
         import win32com.shell
         shell_module = FakeShellModule()
         self.patch(win32com.shell, "shell", shell_module)
@@ -91,10 +93,6 @@
         for val in special_folders.itervalues():
             self.assertIsInstance(val, str)
             val.decode('utf8')
-        # Should not raise exceptions
-
-    if sys.platform != 'win32':
-        test_get_special_folders.skip = 'Only works on Win32'
 
     def test_get_data_dirs(self):
         """Check thet get_data_dirs uses pathsep correctly."""
@@ -132,6 +130,7 @@
             self.addCleanup(os.environ.__setitem__, key, current_value)
             del(os.environ[key])
 
+    @skip('UnicodeEncodeError: bug #907053')
     def test_get_env_path_var(self):
         """Test that get_env_path transforms an env var."""
         fake_path = u"C:\\Users\\Ñandú"
@@ -143,6 +142,7 @@
         self.set_fake_environ(fake_env_var, mbcs_path)
         self.assertEqual(get_env_path(fake_env_var, "unexpected"), utf8_path)
 
+    @skip('UnicodeEncodeError: bug #907053')
     def test_get_env_path_no_var(self):
         """Test that get_env_path returns the default when env var not set."""
         fake_path = u"C:\\Users\\Ñandú"
@@ -151,11 +151,9 @@
 
         self.unset_fake_environ(fake_env_var)
         self.assertEqual(get_env_path(fake_env_var, default), default)
-    test_get_env_path_var.skip = 'UnicodeEncodeError: bug #907053'
-    test_get_env_path_no_var.skip = test_get_env_path_var.skip
-
-
-class ProgramPathBaseTestCase(TestCase):
+
+
+class ProgramPathBaseTestCase(BaseTestCase):
     """Base class for testing the executable finder."""
 
     def setUp(self):

=== modified file 'run-tests'
--- run-tests	2012-07-06 19:04:34 +0000
+++ run-tests	2012-07-12 19:13:36 +0000
@@ -15,9 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set -e -x
-trial dirspec
+
+# Run the tests
+python ./setup.py build test clean
+
+# Run the style checks
 pyflakes dirspec setup.py
 pep8 --repeat . setup.py
-rm -rf _trial_temp
-rm -f .coverage
 

=== modified file 'setup.py'
--- setup.py	2012-05-24 17:55:14 +0000
+++ setup.py	2012-07-12 19:13:36 +0000
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Setup and install dirspec."""
-from distutils.core import setup
+from setuptools import setup
 
 setup(
     name='dirspec',
@@ -23,4 +23,5 @@
     packages=['dirspec'],
     description='XDG Base and User directories implementation',
     url='https://launchpad.net/dirspec',
+    test_suite='dirspec.tests',
     )