ubuntuone-dev-tools

Merge lp:~nataliabidart/ubuntuone-dev-tools/no-xdg-on-windows into lp:ubuntuone-dev-tools

  1. no-xdg-on-windows
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: Sidnei da Silva
Approved revision: 48
Merged at revision: 45
Proposed branch: lp:~nataliabidart/ubuntuone-dev-tools/no-xdg-on-windows
Merge into: lp:ubuntuone-dev-tools
Diff against target: 63 lines (+13/-3)
1 file modified
bin/u1lint (+13/-3)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-dev-tools/no-xdg-on-windows
Reviewer Review Type Date Requested Status
Sidnei da Silva (community) Approve
Review via email: mp+81889@code.launchpad.net

Commit message

* Grab xdg_data_dirs from ubuntu_sso (LP: #888619).

To post a comment you must log in.
Revision history for this message
Sidnei da Silva (sidnei) wrote :

Oh, looks trivial. +1!

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (5.5 KiB)

The attempt to merge lp:~nataliabidart/ubuntuone-dev-tools/no-xdg-on-windows into lp:ubuntuone-dev-tools failed. Below is the output from the failed tests.

Adding path
ubuntuone.devtools.testcase
  DBusTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_dbus
  TestWithDBus
    test_config_file_path ... [OK]
    test_dbus_session_is_running ... [OK]
ubuntuone.devtools.testcase
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.tests.test_decorators
  TestSkipBasicDecorators
    test_skip_class ... [OK]
    test_skip_decorators ... [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]

-------------------------------------------------------------------------------
Ran 18 tests in 0.289s

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 8 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 48 82%
ubuntuone/devtools/services/tests/__init__ 0 0 100%
ubuntuone/devtools/services/tests/test_dbus 14 14 100%
ubuntuone/devtools/testcase 116 79 68%
ubuntuone/devtools/testing/__init__ 0 0 100%
ubuntuone/devtools/testing/txcheck 174 109 62%
ubuntu...

Read more...

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (5.5 KiB)

The attempt to merge lp:~nataliabidart/ubuntuone-dev-tools/no-xdg-on-windows into lp:ubuntuone-dev-tools failed. Below is the output from the failed tests.

Adding path
ubuntuone.devtools.testcase
  DBusTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_dbus
  TestWithDBus
    test_config_file_path ... [OK]
    test_dbus_session_is_running ... [OK]
ubuntuone.devtools.testcase
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.tests.test_decorators
  TestSkipBasicDecorators
    test_skip_class ... [OK]
    test_skip_decorators ... [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]

-------------------------------------------------------------------------------
Ran 18 tests in 0.268s

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 8 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 48 82%
ubuntuone/devtools/services/tests/__init__ 0 0 100%
ubuntuone/devtools/services/tests/test_dbus 14 14 100%
ubuntuone/devtools/testcase 116 79 68%
ubuntuone/devtools/testing/__init__ 0 0 100%
ubuntuone/devtools/testing/txcheck 174 109 62%
ubuntu...

Read more...

Revision history for this message
Sidnei da Silva (sidnei) wrote :

Ok, better. :)

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (6.0 KiB)

The attempt to merge lp:~nataliabidart/ubuntuone-dev-tools/no-xdg-on-windows into lp:ubuntuone-dev-tools failed. Below is the output from the failed tests.

Adding path
ubuntuone.devtools.testcase
  DBusTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_dbus
  TestWithDBus
    test_config_file_path ... [OK]
    test_dbus_session_is_running ... [OK]
ubuntuone.devtools.testcase
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.tests.test_decorators
  TestSkipBasicDecorators
    test_skip_class ... [OK]
    test_skip_decorators ... [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]

-------------------------------------------------------------------------------
Ran 18 tests in 0.257s

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 8 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 48 82%
ubuntuone/devtools/services/tests/__init__ 0 0 100%
ubuntuone/devtools/services/tests/test_dbus 14 14 100%
ubuntuone/devtools/testcase 116 79 68%
ubuntuone/devtools/testing/__init__ 0 0 100%
ubuntuone/devtools/testing/txcheck 174 109 62%
ubuntu...

Read more...

lp:~nataliabidart/ubuntuone-dev-tools/no-xdg-on-windows updated
48. By Natalia Bidart

Disable lint warnings for xdg ubuntu_sso imports.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/u1lint'
2--- bin/u1lint 2011-07-14 17:25:08 +0000
3+++ bin/u1lint 2011-11-10 20:36:23 +0000
4@@ -25,7 +25,12 @@
5 import subprocess
6 import sys
7
8-from xdg.BaseDirectory import xdg_data_dirs
9+# pylint: disable=E0611,F0401
10+try:
11+ from ubuntu_sso.xdg_base_directory import xdg_data_dirs
12+except ImportError:
13+ from xdg.BaseDirectory import xdg_data_dirs
14+# pylint: enable=E0611,F0401
15
16 SRCDIR = os.environ.get('SRCDIR', os.getcwd())
17
18@@ -33,7 +38,7 @@
19 class InvalidSetupException(Exception):
20 """Raised when the env is not correctly setup."""
21
22-
23+
24 def find_python_installation_path():
25 """Return the path where python was installed."""
26 assert(sys.platform == 'win32')
27@@ -98,7 +103,8 @@
28 # the default is to assume that the script is executable and that it
29 # can be found in the path
30 return [script, ]
31-
32+
33+
34 def find_pylintrc():
35 """Return the first pylintrc found."""
36 # Use the pylintrc in the source tree if there is one
37@@ -114,8 +120,10 @@
38 return full_name
39 return None
40
41+
42 PYLINTRC = find_pylintrc()
43
44+
45 def _read_pylintrc_ignored():
46 """Get the ignored files list from pylintrc"""
47 try:
48@@ -129,6 +137,7 @@
49 return []
50 # pylint: enable=E1103
51
52+
53 def _group_lines_by_file(data):
54 """Format file:line:message output as lines grouped by file."""
55 did_fail = False
56@@ -156,6 +165,7 @@
57
58 return (did_fail, "\n".join(outputs))
59
60+
61 def _find_files():
62 """Find all Python files under the current tree."""
63 pyfiles = []

Subscribers

People subscribed via source and target branches

to all changes: