Ubuntu Single Sign On Client

Merge lp:~mandel/ubuntu-sso-client/use-new-testcase into lp:ubuntu-sso-client

  1. use-new-testcase
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Merged
Approved by: Sidnei da Silva
Approved revision: 817
Merged at revision: 817
Proposed branch: lp:~mandel/ubuntu-sso-client/use-new-testcase
Merge into: lp:ubuntu-sso-client
Diff against target: 11 lines (+1/-1)
1 file modified
ubuntu_sso/utils/tests/test_txsecrets.py (+1/-1)
To merge this branch: bzr merge lp:~mandel/ubuntu-sso-client/use-new-testcase
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) Approve
Review via email: mp+83136@code.launchpad.net

Commit message

Changed the import from ubuntuone-dev-tools so that we do not use the deprecated API.

Description of the change

Changed the import from ubuntuone-dev-tools so that we do not use the deprecated API.

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1 trivial

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The attempt to merge lp:~mandel/ubuntu-sso-client/use-new-testcase into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

Running test suite for ubuntu_sso
Xlib: extension "RANDR" missing on display ":99".
Adding path
Traceback (most recent call last):
  File "/usr/bin/u1trial", line 269, in <module>
    main()
  File "/usr/bin/u1trial", line 265, in main
    TestRunner(force_gc=options.force_gc).run(args, options)
  File "/usr/bin/u1trial", line 187, in run
    options.ignored_paths))
  File "/usr/bin/u1trial", line 162, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 90, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/home/tarmac/cache/ubuntu-sso-client/trunk/ubuntu_sso/utils/tests/test_txsecrets.py", line 25, in <module>
    from ubuntuone.devtools.testcases.dbus import DBusTestCase
ImportError: No module named testcases.dbus

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/utils/tests/test_txsecrets.py'
2--- ubuntu_sso/utils/tests/test_txsecrets.py 2011-10-28 10:41:18 +0000
3+++ ubuntu_sso/utils/tests/test_txsecrets.py 2011-11-23 10:47:30 +0000
4@@ -22,7 +22,7 @@
5 import dbus.service
6
7 from twisted.internet.defer import inlineCallbacks, returnValue
8-from ubuntuone.devtools.testcase import DBusTestCase
9+from ubuntuone.devtools.testcases.dbus import DBusTestCase
10
11 from ubuntu_sso.utils import txsecrets
12

Subscribers

People subscribed via source and target branches