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

[Mike McCracken]

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

- 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.

[lp:~mikemc/ubuntuone-client/fix-dummy-sync-menu]

1327. By Mike McCracken on 2012-09-27

merge with trunk

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Brian Curtin (brian.curtin)]

Looks alright to me, tests pass on Windows.

review: Approve

=== added file 'tests/platform/sync_menu/test_common.py'
--- tests/platform/sync_menu/test_common.py	1970-01-01 00:00:00 +0000
+++ tests/platform/sync_menu/test_common.py	2012-09-27 19:25:25 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2012 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/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Test the common dummy Sync Menu implementation for win32/darwin."""
+
+from collections import Callable
+
+from twisted.trial.unittest import TestCase
+
+from ubuntuone.platform.sync_menu import common
+
+
+class SyncMenuDummyTestCase(TestCase):
+    """Test the SyncMenu."""
+
+    def test_dummy_support(self):
+        """Can we create a Dummy with the same #args as the real obj."""
+        dummy = common.UbuntuOneSyncMenu(1, 2)
+        self.assertIsInstance(dummy, common.UbuntuOneSyncMenu)
+
+    def test_dummy_has_update_transfers(self):
+        """Check that the dummy has the proper methods required by the API."""
+        dummy = common.UbuntuOneSyncMenu(1, 2)
+        self.assertIsInstance(dummy.update_transfers, Callable)
 
=== modified file 'ubuntuone/platform/sync_menu/common.py'
--- ubuntuone/platform/sync_menu/common.py	2012-09-20 12:56:32 +0000
+++ ubuntuone/platform/sync_menu/common.py	2012-09-27 19:25:25 +0000
@@ -26,8 +26,13 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Use SyncMenu lib to integrate U1 with the Systray Sync Icon."""
+"""Dummy implementation of sync_menu lib for win32 and darwin."""
 
 
 class UbuntuOneSyncMenu(object):
     """Integrate U1 with the Ubuntu Sync Menu."""
+    def __init__(self, status, syncdaemon_service):
+        """Match #args of linux syncmenu and do nothing."""
+
+    def update_transfers(self):
+        """Do nothing."""