Merge lp:~mandel/ubuntuone-client/sdtool_start_method into lp:ubuntuone-client

[Manuel de la Peña]

Allows to start the syncdaemon by providing a start method to sdtool.

Allows to start the syncdaemon by providing a start method to sdtool. To tests please runthe following:

python C:\Python27\Scripts\u1trial --reactor=txnp tests\platform\windows\test_tools.py

In the method is correctly implemented you will see notepad being executed and close during the tests.

[Natalia Bidart (nataliabidart)]

I'm getting this error:

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "C:\Python27\lib\site-packages\twisted-11.0.0-py2.7-win32.egg\twisted\int
ernet\defer.py", line 1020, in _inlineCallbacks
    result = g.send(result)
  File "C:\Users\Test\src\review\tests\platform\windows\test_tools.py", line 111
3, in test_execution
    self.mocker.verify()
  File "build\bdist.win32\egg\mocker.py", line 645, in verify

exceptions.AssertionError: [Mocker] Unmet expectations:

=> _winreg.OpenKey(ANY, 'Software\\\\Ubuntu One')
 - Performed fewer times than expected.

=> _winreg.QueryValueEx(None, 'SyncDaemonInstallPath')
 - Performed fewer times than expected.

tests.platform.windows.test_tools.TestSyncDaemonTool.test_start
-------------------------------------------------------------------------------
Ran 51 tests in 2.265s

FAILED (errors=1, successes=50)

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

I had the wrong PYTHONPATH set, tests actually pass. But can we please mock subcprocess to avoid having a notepad window being opened?

review: Needs Fixing

[lp:~mandel/ubuntuone-client/sdtool_start_method]

1065. By Manuel de la Peña on 2011-06-30

Mock subprocess so that we do not start a real app.

1066. By Manuel de la Peña on 2011-06-30

Merged with changes on linux.

[Roberto Alsina (ralsina)]

Code looks ok, tests pass.

review: Approve

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'tests/platform/windows/test_tools.py'
--- tests/platform/windows/test_tools.py	2011-06-23 16:33:20 +0000
+++ tests/platform/windows/test_tools.py	2011-06-30 14:22:30 +0000
@@ -24,7 +24,10 @@
     PBServerFactory,
     Root)
 
-from ubuntuone.platform.windows.tools import SyncDaemonTool
+from ubuntuone.platform.windows.tools import (
+    SyncDaemonTool,
+    U1_REG_PATH,
+    SD_INSTALL_PATH)
 from ubuntuone.platform.windows.ipc import (
     Config,
     Events,
@@ -168,6 +171,7 @@
             self.mocker.result(downloads)
             self.mocker.replay()
             result = yield sdtool.get_current_downloads()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertEqual(downloads, result)
 
@@ -189,6 +193,7 @@
             self.mocker.replay()
             self.mocker.result(uploads)
             result = yield sdtool.get_current_uploads()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertEqual(uploads, result)
 
@@ -208,6 +213,7 @@
             self.root.wait_for_nirvana(last_event_interval, ANY, ANY)
             self.mocker.replay()
             yield sdtool.wait_for_nirvana()
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -226,6 +232,7 @@
             self.root.accept_share(share_id, ANY, ANY)
             self.mocker.replay()
             yield sdtool.accept_share(share_id)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -244,6 +251,7 @@
             self.root.reject_share(share_id, ANY, ANY)
             self.mocker.replay()
             yield sdtool.reject_share(share_id)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -262,6 +270,7 @@
             self.root.subscribe(share_id)
             self.mocker.replay()
             yield sdtool.subscribe_share(share_id)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -280,6 +289,7 @@
             self.root.unsubscribe(share_id)
             self.mocker.replay()
             yield sdtool.unsubscribe_share(share_id)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -300,6 +310,7 @@
             self.mocker.result(shares)
             self.mocker.replay()
             yield sdtool.get_shares()
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -317,6 +328,7 @@
             self.root.refresh_shares()
             self.mocker.replay()
             yield sdtool.refresh_shares()
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -338,6 +350,7 @@
             self.root.create_share(path, username, name, access_level)
             self.mocker.replay()
             yield sdtool.offer_share(path, username, name, access_level)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -358,6 +371,7 @@
             self.mocker.result(shares)
             self.mocker.replay()
             yield sdtool.list_shared()
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -376,6 +390,7 @@
             self.root.create(path)
             self.mocker.replay()
             yield sdtool.create_folder(path)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -394,6 +409,7 @@
             self.root.delete(folder_id)
             self.mocker.replay()
             yield sdtool.delete_folder(folder_id)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -412,6 +428,7 @@
             self.root.subscribe(folder_id )
             self.mocker.replay()
             yield sdtool.subscribe_folder(folder_id )
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -430,6 +447,7 @@
             self.root.unsubscribe(folder_id)
             self.mocker.replay()
             yield sdtool.unsubscribe_folder(folder_id)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -450,6 +468,7 @@
             self.mocker.result(folders)
             self.mocker.replay()
             yield sdtool.get_folders()
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -468,6 +487,7 @@
             self.root.get_info(path)
             self.mocker.replay()
             yield client.get_folder_info(path)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -486,6 +506,7 @@
             self.root.get_metadata(path)
             self.mocker.replay()
             yield sdtool.get_metadata(path)
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -510,6 +531,7 @@
             self.root.change_public_access(share_id, node_id, is_public)
             self.mocker.replay()
             yield sdtool.change_public_access(path, is_public)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -529,6 +551,7 @@
             self.root.quit(None, None)
             self.mocker.replay()
             yield sdtool.quit()
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -546,6 +569,7 @@
             self.root.connect()
             self.mocker.replay()
             yield sdtool.connect()
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -563,6 +587,7 @@
             self.root.disconnect()
             self.mocker.replay()
             yield sdtool.disconnect()
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -582,6 +607,7 @@
             self.mocker.result(status)
             self.mocker.replay()
             yield sdtool.get_status()
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -600,6 +626,7 @@
             self.mocker.result({})
             self.mocker.replay()
             yield sdtool.waiting()
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -617,6 +644,7 @@
             self.root.waiting_metadata()
             self.mocker.replay()
             yield sdtool.waiting_metadata()
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -634,6 +662,7 @@
             self.root.waiting_content()
             self.mocker.replay()
             yield sdtool.waiting_content()
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -651,6 +680,7 @@
             self.root.get_throttling_limits(ANY, ANY)
             self.mocker.replay()
             yield sdtool.get_throttling_limits()
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -670,6 +700,7 @@
             self.root.set_throttling_limits(download, upload, ANY, ANY)
             self.mocker.replay()
             yield sdtool.set_throttling_limits(download, upload)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -688,6 +719,7 @@
             self.mocker.result(True)
             self.mocker.replay()
             result = yield sdtool.is_throttling_enabled()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertTrue(result)
 
@@ -706,6 +738,7 @@
             self.root.enable_bandwidth_throttling(ANY, ANY)
             self.mocker.replay()
             yield sdtool.enable_throttling(True)
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -723,6 +756,7 @@
             self.root.disable_bandwidth_throttling(ANY, ANY)
             self.mocker.replay()
             yield sdtool.enable_throttling(False)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -741,6 +775,7 @@
             self.mocker.replay()
             self.mocker.result(True)
             result = yield sdtool.is_autoconnect_enabled()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertTrue(result)
     
@@ -760,6 +795,7 @@
             self.root.set_autoconnect_enabled(enabled)
             self.mocker.replay()
             yield sdtool.enable_autoconnect(enabled)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -778,6 +814,7 @@
             self.mocker.result(True)
             self.mocker.replay()
             result = yield sdtool.is_show_all_notifications_enabled()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertTrue(result)
     
@@ -796,6 +833,7 @@
             self.root.enable_show_all_notifications()
             self.mocker.replay()
             yield sdtool.enable_show_all_notifications(True)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -813,6 +851,7 @@
             self.root.disable_show_all_notifications()
             self.mocker.replay()
             yield sdtool.enable_show_all_notifications(False)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -831,6 +870,7 @@
             self.mocker.result(True)
             self.mocker.replay()
             result = yield sdtool.is_share_autosubscribe_enabled()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertTrue(result)
     
@@ -849,6 +889,7 @@
             self.root.enable_share_autosubscribe()
             self.mocker.replay()
             yield sdtool.enable_share_autosubscribe(True)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -866,6 +907,7 @@
             self.root.disable_share_autosubscribe()
             self.mocker.replay()
             yield sdtool.enable_share_autosubscribe(False)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -884,6 +926,7 @@
             self.mocker.result(True)
             self.mocker.replay()
             result = yield sdtool.is_udf_autosubscribe_enabled()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertTrue(result)
     
@@ -902,6 +945,7 @@
             self.root.enable_udf_autosubscribe()
             self.mocker.replay()
             yield sdtool.enable_udf_autosubscribe(True)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -919,6 +963,7 @@
             self.root.disable_udf_autosubscribe()
             self.mocker.replay()
             yield sdtool.enable_udf_autosubscribe(False)
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -936,6 +981,7 @@
             self.root.refresh_volumes()
             self.mocker.replay()
             yield sdtool.refresh_volumes()
+            self.mocker.restore()
             self.mocker.verify()
     
         d = self._connect()
@@ -954,6 +1000,7 @@
             self.root.rescan_from_scratch(volume_id)
             self.mocker.replay()
             yield sdtool.rescan_from_scratch(volume_id)
+            self.mocker.restore()
             self.mocker.verify()
 
         d = self._connect()
@@ -973,6 +1020,7 @@
             self.mocker.result(dirty_nodes)
             self.mocker.replay()
             result = yield sdtool.get_dirty_nodes()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertEqual(dirty_nodes, result)
 
@@ -993,6 +1041,7 @@
             self.mocker.result(root)
             self.mocker.replay()
             result = yield sdtool.get_root_dir()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertEqual(root, result)
 
@@ -1013,6 +1062,7 @@
             self.mocker.result(shares_dir)
             self.mocker.replay()
             result = yield sdtool.get_shares_dir()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertEqual(shares_dir, result)
 
@@ -1033,6 +1083,7 @@
             self.mocker.result(link)
             self.mocker.replay()
             result = yield sdtool.get_shares_dir_link()
+            self.mocker.restore()
             self.mocker.verify()
             self.assertEqual(link, result)
 
@@ -1040,4 +1091,32 @@
         # pylint: disable=E1101
         d.addCallback(test_execution)
         # pylint: enable=E1101
-        return d       
+        return d
+
+    def test_start(self):
+        """Test that we can indeed start the process."""
+        cmd = 'notepad'
+
+        @defer.inlineCallbacks
+        def test_execution(sdtool):
+            """Actual test."""
+            open_key = self.mocker.replace('_winreg.OpenKey')
+            query_value = self.mocker.replace('_winreg.QueryValueEx')
+            subprocess = self.mocker.replace('subprocess.Popen')
+            # set the expectations
+            open_key(ANY, U1_REG_PATH)
+            query_value(None, SD_INSTALL_PATH)
+            self.mocker.result([cmd,])
+            subprocess([cmd,])
+            self.mocker.result(cmd)
+            self.mocker.replay()
+            process = yield sdtool.start()
+            self.mocker.restore()
+            self.mocker.verify()
+            self.assertEqual(cmd, process)
+            
+        d = self._connect()
+        # pylint: disable=E1101
+        d.addCallback(test_execution)
+        # pylint: enable=E1101
+        return d
\ No newline at end of file

=== modified file 'ubuntuone/platform/windows/tools.py'
--- ubuntuone/platform/windows/tools.py	2011-06-27 15:57:03 +0000
+++ ubuntuone/platform/windows/tools.py	2011-06-30 14:22:30 +0000
@@ -21,17 +21,21 @@
 
 import logging
 import time
+import subprocess
 import sys
 
 from win32api import GetUserNameEx, CloseHandle
 from win32con import NameSamCompatible
 from win32file import CreateFile, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING
 from twisted.internet import defer, reactor
+from _winreg import OpenKey, HKEY_LOCAL_MACHINE, QueryValueEx
 
 from ubuntuone.syncdaemon.config import get_user_config
 from ubuntuone.platform.windows.ipc import NAMED_PIPE_URL
 from ubuntuone.platform.windows.ipc_client import UbuntuOneClient
 
+U1_REG_PATH = r'Software\\Ubuntu One'
+SD_INSTALL_PATH = 'SyncDaemonInstallPath'
 
 def is_running(bus=None):
     """Check if there is a syncdaemon instance running.
@@ -406,7 +410,12 @@
     def start(self):
         """Start syncdaemon if it's not running."""
         if not is_running():
-            raise Exception('Not implemented yet!')
+            # look in the reg to find the path of the .exe to be executed
+            # to launch the sd on windows
+            key = OpenKey(HKEY_LOCAL_MACHINE, U1_REG_PATH)
+            path = QueryValueEx(key, SD_INSTALL_PATH)[0]
+            p = subprocess.Popen([path,])
+            return defer.succeed(p)
         else:
             return defer.succeed(None)