Merge lp:~nataliabidart/ubuntu-sso-client/use-devtools into lp:ubuntu-sso-client

[Natalia Bidart]

* Use ubuntuone-dev-tools to run the tests and the lint checker (LP: #686606).

[dobey (dobey)]

503 - pylint contrib ubuntu_sso
504 + u1lint $MODULE

You might have noticed in running with your changes, but u1lint doesn't take arguments for what sub-directories to run the checks in. It simply checks everything.

review: Approve

[Manuel de la Peña (mandel)]

Tests work for me, I really do not know the diff between u1lint and pylint.

review: Approve

[lp:~nataliabidart/ubuntu-sso-client/use-devtools]

665. By Natalia Bidart on 2010-12-20

u1lint will not take arguments.

=== modified file 'bin/ubuntu-sso-login'
--- bin/ubuntu-sso-login	2010-10-08 21:10:40 +0000
+++ bin/ubuntu-sso-login	2010-12-20 15:43:07 +0000
@@ -21,7 +21,9 @@
 
 """Run the dbus service for UserManagement and ApplicationCredentials."""
 
-# import decimal even if we don't need it.
+# Invalid name "ubuntu-sso-login", pylint: disable=C0103
+
+# import decimal even if we don't need it, pylint: disable=W0611
 import decimal
 # This is a workaround for LP: #467397. Some module in our depency chain sets
 # the locale and imports decimal, and that generates the following trace:
@@ -70,8 +72,8 @@
     # See the link below for info:
     # www.listware.net/201004/gtk-devel-list/115067-unix-signals-in-glib.html
     #
-    # gtk.main_quit and the logger methods are safe to be called from any thread.
-    # Just don't call other random stuff here.
+    # gtk.main_quit and the logger methods are safe to be called from any
+    # thread. Just don't call other random stuff here.
     logger.info("Stoping Ubuntu SSO login manager since SIGHUP was received.")
     gtk.main_quit()
 

=== removed directory 'contrib'
=== removed file 'contrib/__init__.py'
--- contrib/__init__.py	2010-06-22 14:18:04 +0000
+++ contrib/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-# contrib - Extra required code to build/install the client
-#
-# Author: Rodney Dawes <[e-mail]>
-#
-# Copyright 2009-2010 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""Extra things we need to build, test, or install the client."""

=== removed file 'contrib/dbus_util.py'
--- contrib/dbus_util.py	2010-09-03 21:24:47 +0000
+++ contrib/dbus_util.py	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-#
-# Author: Guillermo Gonzalez <[e-mail]>
-#
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Utilies to run a separated DBus session."""
-
-import os
-import signal
-import subprocess
-
-from distutils.spawn import find_executable
-
-SRCDIR = os.environ.get('SRCDIR', os.getcwd())
-
-
-class DBusLaunchError(Exception):
-    """Error while launching dbus-daemon."""
-
-
-class NotFoundError(Exception):
-    """Not found error."""
-
-
-class DBusRunner(object):
-    """A DBus runner."""
-
-    # pylint: disable=C0103
-
-    def __init__(self):
-        self.dbus_address = None
-        self.dbus_pid = None
-        self.running = False
-
-    def startDBus(self):
-        """Start our own session bus daemon for testing."""
-        dbus = find_executable("dbus-daemon")
-        if not dbus:
-            raise NotFoundError("dbus-daemon was not found.")
-
-        config_file = os.path.join(os.path.abspath(SRCDIR),
-                                   "contrib", "testing",
-                                   "dbus-session.conf")
-        dbus_args = ["--fork",
-                     "--config-file=" + config_file,
-                     "--print-address=1",
-                     "--print-pid=2"]
-        p = subprocess.Popen([dbus] + dbus_args,
-                             bufsize=4096, stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE)
-
-        self.dbus_address = "".join(p.stdout.readlines()).strip()
-        self.dbus_pid = int("".join(p.stderr.readlines()).strip())
-
-        if self.dbus_address != "":
-            os.environ["DBUS_SESSION_BUS_ADDRESS"] = self.dbus_address
-        else:
-            os.kill(self.dbus_pid, signal.SIGKILL)
-            raise DBusLaunchError("There was a problem launching dbus-daemon.")
-        self.running = True
-
-    def stopDBus(self):
-        """Stop our DBus session bus daemon."""
-        del os.environ["DBUS_SESSION_BUS_ADDRESS"]
-        os.kill(self.dbus_pid, signal.SIGKILL)
-        self.running = False

=== removed file 'contrib/test'
--- contrib/test	2010-09-03 21:24:47 +0000
+++ contrib/test	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-#!/usr/bin/env python
-#
-# Author: Guillermo Gonzalez <[e-mail]>
-#
-# Copyright 2009-2010 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import re
-import signal
-import sys
-import string
-import subprocess
-import unittest
-
-sys.path.insert(0, os.path.abspath("."))
-
-from distutils.spawn import find_executable
-
-
-class TestRunner(object):
-
-    def _load_unittest(self, relpath):
-        """Load unittests from a Python module with the given relative path."""
-        assert relpath.endswith(".py"), (
-            "%s does not appear to be a Python module" % relpath)
-        modpath = relpath.replace(os.path.sep, ".")[:-3]
-        module = __import__(modpath, None, None, [""])
-
-        # If the module has a 'suite' or 'test_suite' function, use that
-        # to load the tests.
-        if hasattr(module, "suite"):
-            return module.suite()
-        elif hasattr(module, "test_suite"):
-            return module.test_suite()
-        else:
-            return unittest.defaultTestLoader.loadTestsFromModule(module)
-
-    def _collect_tests(self, testpath, test_pattern):
-        """Return the set of unittests."""
-        suite = unittest.TestSuite()
-        if test_pattern:
-            pattern = re.compile('.*%s.*' % test_pattern)
-        else:
-            pattern = None
-
-        if testpath:
-            module_suite = self._load_unittest(testpath)
-            if pattern:
-                for inner_suite in module_suite._tests:
-                    for test in inner_suite._tests:
-                        if pattern.match(test.id()):
-                            suite.addTest(test)
-            else:
-                suite.addTests(module_suite)
-            return suite
-
-        # We don't use the dirs variable, so ignore the warning
-        # pylint: disable=W0612
-        for root, dirs, files in os.walk("ubuntu_sso"):
-            for file in files:
-                path = os.path.join(root, file)
-                if file.endswith(".py") and file.startswith("test_"):
-                    module_suite = self._load_unittest(path)
-                    if pattern:
-                        for inner_suite in module_suite._tests:
-                            for test in inner_suite._tests:
-                                if pattern.match(test.id()):
-                                    suite.addTest(test)
-                    else:
-                        suite.addTests(module_suite)
-        return suite
-
-    def run(self, testpath, test_pattern=None, loops=None):
-        """run the tests. """
-        # install the glib2reactor before any import of the reactor to avoid
-        # using the default SelectReactor and be able to run the dbus tests
-        from twisted.internet import glib2reactor
-        glib2reactor.install()
-        from twisted.internet import reactor
-        from twisted.trial.reporter import TreeReporter
-        from twisted.trial.runner import TrialRunner
-
-        from contrib.dbus_util import DBusRunner
-        dbus_runner = DBusRunner()
-        dbus_runner.startDBus()
-
-        workingDirectory = os.path.join(os.getcwd(), "_trial_temp", "tmp")
-        runner = TrialRunner(reporterFactory=TreeReporter, realTimeErrors=True,
-                            workingDirectory=workingDirectory)
-
-        # setup a custom XDG_CACHE_HOME and create the logs directory
-        xdg_cache = os.path.join(os.getcwd(), "_trial_temp", "xdg_cache")
-        os.environ["XDG_CACHE_HOME"] = xdg_cache
-        # setup the ROOTDIR env var
-        os.environ['ROOTDIR'] = os.getcwd()
-        if not os.path.exists(xdg_cache):
-            os.makedirs(xdg_cache)
-        success = 0
-        try:
-            suite = self._collect_tests(testpath, test_pattern)
-            if loops:
-                old_suite = suite
-                suite = unittest.TestSuite()
-                for x in xrange(loops):
-                    suite.addTest(old_suite)
-            result = runner.run(suite)
-            success = result.wasSuccessful()
-        finally:
-            dbus_runner.stopDBus()
-        if not success:
-            sys.exit(1)
-        else:
-            sys.exit(0)
-
-
-if __name__ == '__main__':
-    from optparse import OptionParser
-    usage = '%prog [options] path'
-    parser = OptionParser(usage=usage)
-    parser.add_option("-t", "--test", dest="test",
-                      help="run specific tests, e.g: className.methodName")
-    parser.add_option("-l", "--loop", dest="loops", type="int", default=1,
-                      help="loop selected tests LOOPS number of times",
-                      metavar="LOOPS")
-
-    (options, args) = parser.parse_args()
-    if args:
-        testpath = args[0]
-        if not os.path.exists(testpath):
-            print "the path to test does not exists!"
-            sys.exit()
-    else:
-        testpath = None
-    TestRunner().run(testpath, options.test, options.loops)

=== removed directory 'contrib/testing'
=== removed file 'contrib/testing/__init__.py'
--- contrib/testing/__init__.py	2010-09-02 16:41:05 +0000
+++ contrib/testing/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-"""Testing utilities for Ubuntu SSO code."""

=== removed file 'contrib/testing/dbus-session.conf'
--- contrib/testing/dbus-session.conf	2010-06-18 20:51:58 +0000
+++ contrib/testing/dbus-session.conf	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-<!-- This configuration file controls our test-only session bus -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- We only use a session bus -->
-  <type>session</type>
-
-  <listen>unix:tmpdir=/tmp</listen>
-
-  <!-- Load our own services.
-       To make other dbus service in this session bus, just add another servicedir entry. -->
-  <servicedir>dbus-session</servicedir>
-  <!-- Load the standard session services -->
-  <!--standard_session_servicedirs /-->
-
-  <policy context="default">
-    <!-- Allow everything to be sent -->
-    <allow send_destination="*" eavesdrop="true"/>
-    <!-- Allow everything to be received -->
-    <allow eavesdrop="true"/>
-    <!-- Allow anyone to own anything -->
-    <allow own="*"/>
-  </policy>
-
-  <!-- Config files are placed here that among other things, 
-       further restrict the above policy for specific services. -->
-  <includedir>/etc/dbus-1/session.d</includedir>
-
-  <!-- raise the service start timeout to 40 seconds as it can timeout
-       on the live cd on slow machines -->
-  <limit name="service_start_timeout">60000</limit>
-
-  <!-- This is included last so local configuration can override what's 
-       in this standard file -->
-  <include ignore_missing="yes">session-local.conf</include>
-
-  <include ignore_missing="yes" if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
-
-  <!-- For the session bus, override the default relatively-low limits 
-       with essentially infinite limits, since the bus is just running 
-       as the user anyway, using up bus resources is not something we need 
-       to worry about. In some cases, we do set the limits lower than 
-       "all available memory" if exceeding the limit is almost certainly a bug, 
-       having the bus enforce a limit is nicer than a huge memory leak. But the 
-       intent is that these limits should never be hit. -->
-
-  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
-  <limit name="max_incoming_bytes">1000000000</limit>
-  <limit name="max_outgoing_bytes">1000000000</limit>
-  <limit name="max_message_size">1000000000</limit>
-  <limit name="service_start_timeout">120000</limit>  
-  <limit name="auth_timeout">240000</limit>
-  <limit name="max_completed_connections">100000</limit>  
-  <limit name="max_incomplete_connections">10000</limit>
-  <limit name="max_connections_per_user">100000</limit>
-  <limit name="max_pending_service_starts">10000</limit>
-  <limit name="max_names_per_connection">50000</limit>
-  <limit name="max_match_rules_per_connection">50000</limit>
-  <limit name="max_replies_per_connection">50000</limit>
-  <limit name="reply_timeout">300000</limit>
-
-</busconfig>

=== removed file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py	2010-09-30 20:49:38 +0000
+++ contrib/testing/testcase.py	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-#
-# Author: Guillermo Gonzalez <[e-mail]>
-# Author: Natalia B. Bidart <[e-mail]>
-#
-# Copyright 2009-2010 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""Base tests cases and test utilities."""
-
-import logging
-
-import dbus
-
-from dbus.mainloop.glib import DBusGMainLoop
-from twisted.internet import defer
-from twisted.python import failure
-from twisted.trial.unittest import TestCase
-
-
-class DBusTestCase(TestCase):
-    """Test the DBus event handling."""
-
-    def setUp(self):
-        """Setup the infrastructure fo the test (dbus service)."""
-        self.loop = DBusGMainLoop(set_as_default=True)
-        self.bus = dbus.bus.BusConnection(mainloop=self.loop)
-        # monkeypatch busName.__del__ to avoid errors on gc
-        # we take care of releasing the name in shutdown
-        dbus.service.BusName.__del__ = lambda _: None
-        self.bus.set_exit_on_disconnect(False)
-        self.signal_receivers = set()
-
-    def tearDown(self):
-        """Cleanup the test."""
-        d = self.cleanup_signal_receivers(self.signal_receivers)
-        d.addBoth(self._tear_down)
-        return d
-
-    def _tear_down(self, _):
-        """Shutdown."""
-        self.bus.flush()
-        self.bus.close()
-
-    def error_handler(self, error):
-        """Default error handler for DBus calls."""
-        if isinstance(error, failure.Failure):
-            self.fail(error.getErrorMessage())
-
-    def cleanup_signal_receivers(self, signal_receivers):
-        """Cleanup self.signal_receivers and returns a deferred."""
-        deferreds = []
-        for match in signal_receivers:
-            d = defer.Deferred()
-
-            def callback(*args):
-                """Callback that accepts *args."""
-                if not d.called:
-                    d.callback(args)
-
-            self.bus.call_async(dbus.bus.BUS_DAEMON_NAME,
-                                dbus.bus.BUS_DAEMON_PATH,
-                                dbus.bus.BUS_DAEMON_IFACE, 'RemoveMatch', 's',
-                                (str(match),), callback, self.error_handler)
-            deferreds.append(d)
-        if deferreds:
-            return defer.DeferredList(deferreds)
-        else:
-            return defer.succeed(True)
-
-
-class MementoHandler(logging.Handler):
-    """A handler class which store logging records in a list."""
-
-    def __init__(self, *args, **kwargs):
-        """Create the instance, and add a records attribute."""
-        logging.Handler.__init__(self, *args, **kwargs)
-        self.records = []
-
-    def emit(self, record):
-        """Just add the record to self.records."""
-        self.records.append(record)
-
-    def check(self, level, *msgs):
-        """Verifies that the msgs are logged in the specified level."""
-        for rec in self.records:
-            if rec.levelno == level and all(m in rec.message for m in msgs):
-                return True
-        return False
-
-    def check_debug(self, *msgs):
-        """Shortcut for checking in DEBUG."""
-        return self.check(logging.DEBUG, *msgs)
-
-    def check_info(self, *msgs):
-        """Shortcut for checking in INFO."""
-        return self.check(logging.INFO, *msgs)
-
-    def check_warning(self, *msgs):
-        """Shortcut for checking in WARNING."""
-        return self.check(logging.WARNING, *msgs)
-
-    def check_error(self, *msgs):
-        """Shortcut for checking in ERROR."""
-        return self.check(logging.ERROR, *msgs)
-
-    def check_exception(self, exception_class, *msgs):
-        """Shortcut for checking exceptions."""
-        for rec in self.records:
-            if rec.levelno == logging.ERROR and \
-               all(m in rec.exc_text for m in msgs) and \
-               exception_class == rec.exc_info[0]:
-                return True
-        return False

=== modified file 'run-tests'
--- run-tests	2010-09-30 20:49:38 +0000
+++ run-tests	2010-12-20 15:43:07 +0000
@@ -15,14 +15,23 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+if [ $# -ne 0 ]; then
+    # an extra argument was given
+    MODULE="$@"
+else
+    # run all tests, useful for tarmac and reviews
+    MODULE="ubuntu_sso"
+fi
+
 style_check() {
-    pylint contrib ubuntu_sso
+    u1lint
     if [ -x `which pep8` ]; then
-        pep8 --repeat bin/ contrib/ ubuntu_sso/
+        pep8 --repeat bin/ $MODULE
     else
         echo "Please install the 'pep8' package."
     fi
 }
 
-`which xvfb-run` ./contrib/test "$@" && style_check
-rm -rf _trial_temp/
+echo "Running test suite for ""$MODULE"
+`which xvfb-run` u1trial "$MODULE" && style_check
+rm -rf _trial_temp

=== modified file 'setup.py'
--- setup.py	2010-12-16 16:27:01 +0000
+++ setup.py	2010-12-20 15:43:07 +0000
@@ -31,16 +31,15 @@
 assert DistUtilsExtra.auto.__version__ >= '2.18', \
        'needs DistUtilsExtra.auto >= 2.18'
 
-from distutils.core import setup
 from distutils.spawn import find_executable
-from distutils.command import clean, build
+from distutils.command import clean
 
 # Defining variables for various rules here, similar to a Makefile.am
 CLEANFILES = ['data/com.ubuntu.sso.service', 'po/ubuntu-sso-client.pot',
               'MANIFEST']
 
 
-# XXX: This needs some serious cleanup
+# This needs some serious cleanup
 class SSOBuild(build_extra.build_extra):
     """Class to build the extra files."""
 

=== modified file 'ubuntu_sso/gtk/tests/test_gui.py'
--- ubuntu_sso/gtk/tests/test_gui.py	2010-11-29 16:04:26 +0000
+++ ubuntu_sso/gtk/tests/test_gui.py	2010-12-20 15:43:07 +0000
@@ -30,8 +30,8 @@
 import webkit
 
 from twisted.trial.unittest import TestCase
+from ubuntuone.devtools.handlers import MementoHandler
 
-from contrib.testing.testcase import MementoHandler
 from ubuntu_sso.gtk import gui
 from ubuntu_sso.tests import (APP_NAME, TC_URL, HELP_TEXT, CAPTCHA_ID,
     CAPTCHA_SOLUTION, EMAIL, EMAIL_TOKEN, NAME, PASSWORD, RESET_PASSWORD_TOKEN)

=== modified file 'ubuntu_sso/tests/bin/show_gui'
--- ubuntu_sso/tests/bin/show_gui	2010-11-19 21:25:28 +0000
+++ ubuntu_sso/tests/bin/show_gui	2010-12-20 15:43:07 +0000
@@ -31,11 +31,12 @@
             'Nam sed lorem nibh. Suspendisse gravida nulla non nunc suscipit' \
             ' pulvinar tempus ut augue.'
 
-main_quit = lambda *args, **kwargs: gtk.main_quit()
-
 
 if __name__ == '__main__':
-    tc_url=TC_URL
+
+    # pylint: disable=C0103, E1101
+
+    tc_url = TC_URL
     login_only = False
     xid = 0
 
@@ -51,7 +52,7 @@
         win.show()
         xid = win.window.xid
 
-    UbuntuSSOClientGUI(close_callback=main_quit, app_name=APP_NAME,
-                       tc_url=tc_url, help_text=HELP_TEXT, window_id=xid,
-                       login_only=login_only)
+    UbuntuSSOClientGUI(close_callback=lambda *args, **kwargs: gtk.main_quit(),
+                       app_name=APP_NAME, tc_url=tc_url, help_text=HELP_TEXT,
+                       window_id=xid, login_only=login_only)
     gtk.main()

=== modified file 'ubuntu_sso/tests/bin/show_nm_state'
--- ubuntu_sso/tests/bin/show_nm_state	2010-09-03 21:14:00 +0000
+++ ubuntu_sso/tests/bin/show_nm_state	2010-12-20 15:43:07 +0000
@@ -26,7 +26,6 @@
 from ubuntu_sso.networkstate import NetworkManagerState, NM_STATE_NAMES
 
 DBusGMainLoop(set_as_default=True)
-loop = gobject.MainLoop()
 
 
 def got_state(state):
@@ -34,8 +33,9 @@
     try:
         print NM_STATE_NAMES[state]
     finally:
-        loop.quit()
+        gobject.MainLoop().quit()
 
+# pylint: disable=C0103
 nms = NetworkManagerState(got_state)
 nms.find_online_state()
-loop.run()
+gobject.MainLoop().run()

=== modified file 'ubuntu_sso/tests/test_credentials.py'
--- ubuntu_sso/tests/test_credentials.py	2010-11-24 12:48:28 +0000
+++ ubuntu_sso/tests/test_credentials.py	2010-12-20 15:43:07 +0000
@@ -26,8 +26,8 @@
 from twisted.internet import defer
 from twisted.internet.defer import inlineCallbacks
 from twisted.trial.unittest import TestCase, FailTest
+from ubuntuone.devtools.handlers import MementoHandler
 
-from contrib.testing.testcase import MementoHandler
 from ubuntu_sso import credentials
 from ubuntu_sso.credentials import (APP_NAME_KEY, HELP_TEXT_KEY, NO_OP,
     PING_URL_KEY, TC_URL_KEY, UI_CLASS_KEY, UI_MODULE_KEY, WINDOW_ID_KEY,

=== modified file 'ubuntu_sso/tests/test_main.py'
--- ubuntu_sso/tests/test_main.py	2010-12-15 20:42:15 +0000
+++ ubuntu_sso/tests/test_main.py	2010-12-20 15:43:07 +0000
@@ -27,11 +27,11 @@
 from twisted.internet import defer
 from twisted.internet.defer import Deferred, inlineCallbacks
 from twisted.trial.unittest import TestCase
+from ubuntuone.devtools.handlers import MementoHandler
 
 import ubuntu_sso.keyring
 import ubuntu_sso.main
 
-from contrib.testing.testcase import MementoHandler
 from ubuntu_sso import DBUS_CREDENTIALS_IFACE
 from ubuntu_sso.keyring import U1_APP_NAME
 from ubuntu_sso.main import (U1_PING_URL, blocking, except_to_errdict,