← Back to branch summary

~didrocks/ubuntuone-client/dont-suffer-zg-crash

« back to all changes in this revision

Viewing changes to tests/test_preferences.py

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2011-01-25 16:42:52 UTC
  • mto: This revision was merged to the branch mainline in revision 64.
  • Revision ID: james.westby@ubuntu.com-20110125164252-rl1pybasx1nsqgoy
Tags: upstream-1.5.3
Import upstream version 1.5.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_preferences.py
29
29
from twisted.python.failure import Failure
30
30
from twisted.trial.unittest import TestCase
31
31
 
32
 
from contrib.testing.testcase import (
33
 
    FAKED_CREDENTIALS,
34
 
    MementoHandler)
 
32
from contrib.testing.testcase import FAKED_CREDENTIALS
35
33
from tests.platform.linux.test_dbus import (
36
 
    DBusTwistedTestCase,
37
34
    FakeLogin
38
35
)
39
36
from ubuntuone import clientdefs
40
37
from ubuntuone.platform.linux import tools
 
38
from ubuntuone.devtools.handlers import MementoHandler
 
39
from ubuntuone.devtools.testcase import DBusTestCase
41
40
 
42
41
 
43
42
class SyncDaemonTool(tools.SyncDaemonTool):
66
65
    pass
67
66
 
68
67
 
69
 
class PreferencesTests(MockerTestCase, DBusTwistedTestCase):
 
68
class PreferencesTests(MockerTestCase, DBusTestCase):
70
69
    """Basic tests for the ubuntuone-preferences app."""
71
70
 
72
71
    _path = os.path.join(os.getcwd(), "bin", "ubuntuone-preferences")
75
74
 
76
75
    def setUp(self):
77
76
        MockerTestCase.setUp(self)
78
 
        DBusTwistedTestCase.setUp(self)
 
77
        DBusTestCase.setUp(self)
79
78
        self.oauth = FakeLogin(self.bus)
80
 
        self.patch(ubuntu_sso, 'DBUS_CREDENTIALS_PATH', '/oauthdesktop')
 
79
        self.patch(ubuntu_sso, 'DBUS_CREDENTIALS_PATH',
 
80
                   '/com/ubuntu/sso/credentials')
81
81
 
82
82
        self.u1prefs.make_rest_request = self.make_rest_request
83
83
        self.u1prefs.SyncDaemonTool = SyncDaemonTool
93
93
                        signal_receivers.update(match)
94
94
        yield self.cleanup_signal_receivers(signal_receivers)
95
95
        self.oauth.shutdown()
96
 
        yield DBusTwistedTestCase.tearDown(self)
 
96
        yield DBusTestCase.tearDown(self)
97
97
 
98
98
    def make_rest_request(self, url=None, method='GET',
99
99
                          callback=None):
532
532
        "This shouldn't depend on the real DBus service (see bug #591340)."
533
533
 
534
534
 
535
 
class CallbacksTest(TestCase, MockerTestCase):
 
535
class CallbacksTests(TestCase, MockerTestCase):
536
536
    """Tests for DBus callbacks."""
537
537
 
538
538
    _path = os.path.join(os.getcwd(), "bin", "ubuntuone-preferences")
542
542
    def setUp(self):
543
543
        """Set up the test."""
544
544
        TestCase.setUp(self)
 
545
        MockerTestCase.setUp(self)
545
546
        self.memento = MementoHandler()
546
547
        logger = logging.getLogger("ubuntuone-preferences")
547
548
        logger.addHandler(self.memento)