← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/ubuntuone-control-panel/oneiric

« back to all changes in this revision

Viewing changes to ubuntuone/controlpanel/dbustests/test_dbus_service.py

https://launchpad.net/bugs/845105
https://launchpad.net/bugs/850142
https://launchpad.net/bugs/849494
https://launchpad.net/bugs/838778
https://launchpad.net/bugs/838778
https://launchpad.net/bugs/838778
https://launchpad.net/bugs/835093
https://launchpad.net/bugs/819955
* New upstream release:
  [ Alejandro J. Cura <alecu@canonical.com>]
    - Do not throw a webclient error when closing
      (LP: #845105).
  [ Natalia B. Bidart <natalia.bidart@canonical.com> ]
    - Removed all code related to Bookmarks (LP: #850142).
    - Replaces references to "Evolution" by "Thunderbird" (LP: #849494).
  [ Rodney Dawes <rodney.dawes@canonical.com> ]
    - Don't install a .desktop file for control panel
      (part of LP: #838778).
    - Point the indicator/Unity API at the installer .desktop file
      (part of LP: #838778).
    - Set the WMCLASS so Unity will fall back properly
      (part of LP: #838778).
    - Fix a few grammar mistakes (LP: #835093).
    - Don't show the "Get NGB free!" label on "Join now" button at all
      (LP: #819955).
* debian/control:
  - ubuntuone-control-panel-gtk depends now on ubuntuone-installer >= 2.0.0.
  - require ubuntuone-client >= 2.0.0.
  - require ubuntu-sso-client >= 1.4.0.
  - no longer install a .desktop file (will be installed by ubuntuone-installer).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/controlpanel/dbustests/test_dbus_service.py
50
50
        "limit_bandwidth": True,
51
51
        "max_upload_speed": 12345,
52
52
        "max_download_speed": 54321,
53
 
        "available_services": "files, contacts, music, bookmarks",
 
53
        "available_services": "files, contacts, music",
54
54
        "enabled_services": "files, music",
55
55
    },
56
56
    {
59
59
        "date_added": "2010-09-22T20:45:38.0",
60
60
        "type": "computer",
61
61
        "configurable": False,
62
 
        "available_services": "files, contacts, bookmarks",
63
 
        "enabled_services": "files, bookmarks",
 
62
        "available_services": "files, contacts",
 
63
        "enabled_services": "files",
64
64
    },
65
65
]
66
66
 
244
244
        """Configure a given replication."""
245
245
        return self._process(replication_id)
246
246
 
247
 
    def query_bookmark_extension(self):
248
 
        """True if the bookmark extension has been installed."""
249
 
        return self._process(False)
250
 
 
251
 
    def install_bookmarks_extension(self):
252
 
        """Install the extension to sync bookmarks."""
253
 
        return self._process(None)
254
 
 
255
247
    def shutdown(self):
256
248
        """Stop this service."""
257
249
        self.shutdown_func()
616
608
                expected_replication_id, {'enabled': ''})
617
609
        return self.assert_correct_method_call(*args)
618
610
 
619
 
    def test_query_bookmarks_extension(self):
620
 
        """The bookmarks extension is queried."""
621
 
 
622
 
        def got_signal(enabled):
623
 
            """The correct status was received."""
624
 
            self.assertEqual(enabled, False)
625
 
            self.deferred.callback("success")
626
 
 
627
 
        args = ("QueryBookmarksResult", "QueryBookmarksError", got_signal,
628
 
                self.backend.query_bookmark_extension)
629
 
        return self.assert_correct_method_call(*args)
630
 
 
631
 
    def test_install_bookmarks_extension(self):
632
 
        """The bookmarks extension is installed."""
633
 
 
634
 
        def got_signal():
635
 
            """The extension was installed."""
636
 
            self.deferred.callback("success")
637
 
 
638
 
        args = ("InstallBookmarksSuccess", "InstallBookmarksError", got_signal,
639
 
                self.backend.install_bookmarks_extension)
640
 
        return self.assert_correct_method_call(*args)
641
 
 
642
611
 
643
612
class OperationsErrorTestCase(OperationsTestCase):
644
613
    """Test for the DBus service operations when there is an error."""