Merge lp:~mikemc/ubuntuone-client/fix-dummy-sync-menu into lp:ubuntuone-client

Proposed by Mike McCracken on 2012-09-27
Status: Merged
Approved by: Mike McCracken on 2012-09-28
Approved revision: 1327
Merged at revision: 1327
Proposed branch: lp:~mikemc/ubuntuone-client/fix-dummy-sync-menu
Merge into: lp:ubuntuone-client
Prerequisite: lp:~diegosarmentero/ubuntuone-client/ubuntuone-client-timer
Diff against target: 72 lines (+55/-1)
2 files modified
tests/platform/sync_menu/test_common.py (+49/-0)
ubuntuone/platform/sync_menu/common.py (+6/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-client/fix-dummy-sync-menu
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve on 2012-09-27
Diego Sarmentero (community) 2012-09-27 Approve on 2012-09-27
Review via email: mp+126766@code.launchpad.net

This proposal supersedes a proposal from 2012-09-24.

Commit message

- Fix dummy sync menu implementation for windows and darwin. (LP: #1055840)

Description of the change

- Fix dummy sync menu implementation for windows and darwin. (LP: #1055840)

Added a test to check that the dummy class has the same API, fixed missing function.

Tests pass on darwin and linux (precise).
(On darwin, I only ran the specific tests that changed, since trunk tests have never worked.)

With this fix, an app built from trunk runs correctly on darwin again.

To post a comment you must log in.
1327. By Mike McCracken on 2012-09-27

merge with trunk

Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Brian Curtin (brian.curtin) wrote :

Looks alright to me, tests pass on Windows.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'tests/platform/sync_menu/test_common.py'
2--- tests/platform/sync_menu/test_common.py 1970-01-01 00:00:00 +0000
3+++ tests/platform/sync_menu/test_common.py 2012-09-27 19:25:25 +0000
4@@ -0,0 +1,49 @@
5+# -*- coding: utf-8 *-*
6+#
7+# Copyright 2012 Canonical Ltd.
8+#
9+# This program is free software: you can redistribute it and/or modify it
10+# under the terms of the GNU General Public License version 3, as published
11+# by the Free Software Foundation.
12+#
13+# This program is distributed in the hope that it will be useful, but
14+# WITHOUT ANY WARRANTY; without even the implied warranties of
15+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
16+# PURPOSE. See the GNU General Public License for more details.
17+#
18+# You should have received a copy of the GNU General Public License along
19+# with this program. If not, see <http://www.gnu.org/licenses/>.
20+#
21+# In addition, as a special exception, the copyright holders give
22+# permission to link the code of portions of this program with the
23+# OpenSSL library under certain conditions as described in each
24+# individual source file, and distribute linked combinations
25+# including the two.
26+# You must obey the GNU General Public License in all respects
27+# for all of the code used other than OpenSSL. If you modify
28+# file(s) with this exception, you may extend this exception to your
29+# version of the file(s), but you are not obligated to do so. If you
30+# do not wish to do so, delete this exception statement from your
31+# version. If you delete this exception statement from all source
32+# files in the program, then also delete it here.
33+"""Test the common dummy Sync Menu implementation for win32/darwin."""
34+
35+from collections import Callable
36+
37+from twisted.trial.unittest import TestCase
38+
39+from ubuntuone.platform.sync_menu import common
40+
41+
42+class SyncMenuDummyTestCase(TestCase):
43+ """Test the SyncMenu."""
44+
45+ def test_dummy_support(self):
46+ """Can we create a Dummy with the same #args as the real obj."""
47+ dummy = common.UbuntuOneSyncMenu(1, 2)
48+ self.assertIsInstance(dummy, common.UbuntuOneSyncMenu)
49+
50+ def test_dummy_has_update_transfers(self):
51+ """Check that the dummy has the proper methods required by the API."""
52+ dummy = common.UbuntuOneSyncMenu(1, 2)
53+ self.assertIsInstance(dummy.update_transfers, Callable)
54
55=== modified file 'ubuntuone/platform/sync_menu/common.py'
56--- ubuntuone/platform/sync_menu/common.py 2012-09-20 12:56:32 +0000
57+++ ubuntuone/platform/sync_menu/common.py 2012-09-27 19:25:25 +0000
58@@ -26,8 +26,13 @@
59 # do not wish to do so, delete this exception statement from your
60 # version. If you delete this exception statement from all source
61 # files in the program, then also delete it here.
62-"""Use SyncMenu lib to integrate U1 with the Systray Sync Icon."""
63+"""Dummy implementation of sync_menu lib for win32 and darwin."""
64
65
66 class UbuntuOneSyncMenu(object):
67 """Integrate U1 with the Ubuntu Sync Menu."""
68+ def __init__(self, status, syncdaemon_service):
69+ """Match #args of linux syncmenu and do nothing."""
70+
71+ def update_transfers(self):
72+ """Do nothing."""

Subscribers

People subscribed via source and target branches