Merge lp:~dobey/ubuntuone-dev-tools/use-dirspec into lp:ubuntuone-dev-tools

[dobey]

Switch xdg.BaseDirectory usage over to using dirspec.basedir instead

This needs https://code.launchpad.net/~dobey/dirspec/add-tests/+merge/86130 to be able to test.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-dev-tools/use-dirspec into lp:ubuntuone-dev-tools failed. Below is the output from the failed tests.

/home/tarmac/cache/ubuntuone-dev-tools/trunk/ubuntuone/devtools/testcases/dbus.py:27: DeprecationWarning: Deprecated import path; use ubuntuone.devtools.testcasesinstead.
  from ubuntuone.devtools.testcase import BaseTestCase, skipIf
Traceback (most recent call last):
  File "bin/u1trial", line 325, in <module>
    main()
  File "bin/u1trial", line 305, in main
    suite = trial_runner.get_suite(config)
  File "bin/u1trial", line 184, in get_suite
    config['ignore-paths']))
  File "bin/u1trial", line 168, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "bin/u1trial", line 108, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/home/tarmac/cache/ubuntuone-dev-tools/trunk/ubuntuone/devtools/services/tests/test_dbus.py", line 6, in <module>
    from ubuntuone.devtools.testcases.dbus import DBusTestCase
  File "/home/tarmac/cache/ubuntuone-dev-tools/trunk/ubuntuone/devtools/testcases/dbus.py", line 30, in <module>
    from ubuntuone.devtools.services.dbus import DBusRunner
  File "/home/tarmac/cache/ubuntuone-dev-tools/trunk/ubuntuone/devtools/services/dbus.py", line 23, in <module>
    from dirspec.basedir import load_data_paths
ImportError: No module named dirspec.basedir

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-dev-tools/use-dirspec into lp:ubuntuone-dev-tools failed. Below is the output from the failed tests.

ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_dbus
  TestWithDBus
    test_config_file_path ... [OK]
    test_dbus_session_is_running ... [OK]
ubuntuone.devtools.tests.test_txcheck
  TestCheckTwistedTestClass
    test_bad_mixin_order ... [OK]
    test_bare_super ... [OK]
    test_inline_callbacks ... [OK]
    test_inline_callbacks_missing ... [OK]
    test_missing_return ... [OK]
    test_no_problems ... [OK]
    test_not_twisted ... [OK]
    test_ok_mixin_order ... [OK]
    test_super_not_called ... [OK]
  TestTwistedCheckSuite
    test_suite_catches_problems ... [OK]
    test_suite_runs_tests ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.tests.test_decorators
  TestSkipBasicDecorators
    test_skip_class ... [OK]
    test_skip_decorators ... [OK]

-------------------------------------------------------------------------------
Ran 18 tests in 0.229s

PASSED (successes=18)
Name Stmts Exec Cover
-----------------------------------------------------------------
ubuntuone/__init__ 1 0 0%
ubuntuone/devtools/__init__ 0 0 100%
ubuntuone/devtools/handlers 30 0 0%
ubuntuone/devtools/reactors/__init__ 0 0 100%
ubuntuone/devtools/reactors/glib 7 0 0%
ubuntuone/devtools/reactors/qt4 11 0 0%
ubuntuone/devtools/reactors/twisted 2 0 0%
ubuntuone/devtools/reactors/txnp 4 0 0%
ubuntuone/devtools/services/__init__ 0 0 100%
ubuntuone/devtools/services/dbus 58 33 56%
ubuntuone/devtools/services/tests/__init__ 0 0 100%
ubuntuone/devtools/services/tests/test_dbus 16 8 50%
ubuntuone/devtools/testcase 4 0 0%
ubuntuone/devtools/testcases/__init__ 77 27 35%
ubuntuone/devtools/testcases/dbus 42 14 33%
ubuntuone/devtools/testin...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-dev-tools/use-dirspec into lp:ubuntuone-dev-tools failed. Below is the output from the failed tests.

ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_dbus
  TestWithDBus
    test_config_file_path ... [OK]
    test_dbus_session_is_running ... [OK]
ubuntuone.devtools.tests.test_txcheck
  TestCheckTwistedTestClass
    test_bad_mixin_order ... [OK]
    test_bare_super ... [OK]
    test_inline_callbacks ... [OK]
    test_inline_callbacks_missing ... [OK]
    test_missing_return ... [OK]
    test_no_problems ... [OK]
    test_not_twisted ... [OK]
    test_ok_mixin_order ... [OK]
    test_super_not_called ... [OK]
  TestTwistedCheckSuite
    test_suite_catches_problems ... [OK]
    test_suite_runs_tests ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.tests.test_decorators
  TestSkipBasicDecorators
    test_skip_class ... [OK]
    test_skip_decorators ... [OK]

-------------------------------------------------------------------------------
Ran 18 tests in 0.237s

PASSED (successes=18)
Name Stmts Exec Cover
-----------------------------------------------------------------
ubuntuone/__init__ 1 0 0%
ubuntuone/devtools/__init__ 0 0 100%
ubuntuone/devtools/handlers 30 0 0%
ubuntuone/devtools/reactors/__init__ 0 0 100%
ubuntuone/devtools/reactors/glib 7 0 0%
ubuntuone/devtools/reactors/qt4 11 0 0%
ubuntuone/devtools/reactors/twisted 2 0 0%
ubuntuone/devtools/reactors/txnp 4 0 0%
ubuntuone/devtools/services/__init__ 0 0 100%
ubuntuone/devtools/services/dbus 58 33 56%
ubuntuone/devtools/services/tests/__init__ 0 0 100%
ubuntuone/devtools/services/tests/test_dbus 16 8 50%
ubuntuone/devtools/testcase 4 0 0%
ubuntuone/devtools/testcases/__init__ 77 27 35%
ubuntuone/devtools/testcases/dbus 42 14 33%
ubuntuone/devtools/testin...

=== modified file 'bin/u1lint'
--- bin/u1lint	2011-11-21 19:58:40 +0000
+++ bin/u1lint	2011-12-19 23:06:14 +0000
@@ -25,12 +25,7 @@
 import subprocess
 import sys
 
-# pylint: disable=E0611,F0401
-try:
-    from ubuntu_sso.xdg_base_directory import xdg_data_dirs
-except ImportError:
-    from xdg.BaseDirectory import xdg_data_dirs
-# pylint: enable=E0611,F0401
+from dirspec.basedir import xdg_data_dirs
 
 SRCDIR = os.environ.get('SRCDIR', os.getcwd())
 

=== modified file 'ubuntuone/devtools/services/dbus.py'
--- ubuntuone/devtools/services/dbus.py	2011-05-26 20:17:51 +0000
+++ ubuntuone/devtools/services/dbus.py	2011-12-19 23:06:14 +0000
@@ -20,9 +20,9 @@
 import signal
 import subprocess
 
+from dirspec.basedir import load_data_paths
 from distutils.spawn import find_executable
 from urllib import quote
-from xdg.BaseDirectory import load_data_paths
 
 
 class DBusLaunchError(Exception):