Merge lp:~mandel/ubuntuone-client/fix-881186 into lp:ubuntuone-client

[Manuel de la Peña]

Fixes lp:881186

Ensure that if the path is missing we let the client now that we did not manage to start the sd.

Fixes lp:881186

Ensure that if the path is missing we let the client now that we did not manage to start the sd.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'tests/platform/windows/test_tools.py'
--- tests/platform/windows/test_tools.py	2011-10-28 19:17:47 +0000
+++ tests/platform/windows/test_tools.py	2011-11-30 15:00:44 +0000
@@ -14,14 +14,18 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import sys
 
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform.tools.windows import (
-    SyncDaemonToolProxy,
-    UbuntuOneClient,
-)
+from ubuntuone.platform.tools import windows
+
+
+# ugly trick to stop pylint for complaining about
+# WindowsError on Linux
+if sys.platform != 'win32':
+    WindowsError = None
 
 
 class TestSyncDaemonTool(TestCase):
@@ -30,8 +34,8 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(TestSyncDaemonTool, self).setUp()
-        self.patch(UbuntuOneClient, "connect", lambda _: defer.Deferred())
-        self.sdtool = SyncDaemonToolProxy()
+        self.patch(windows.UbuntuOneClient, "connect", lambda _: defer.Deferred())
+        self.sdtool = windows.SyncDaemonToolProxy()
 
     def test_call_after_connection(self):
         """Test the _call_after_connection method."""
@@ -79,3 +83,14 @@
                 attr = getattr(self.sdtool, attr_name)
                 func_name = getattr(attr, "__name__", None)
                 self.assertNotEqual(func_name, "call_after_connection_inner")
+
+    def test_start_missing_exe(self):
+        """Test starting the service when the exe is missing."""
+        # file is missing
+        self.patch(windows.os.path, 'exists', lambda f: False)
+        key = 'key'
+        path = 'path/to/exe'
+        self.patch(windows, 'OpenKey', lambda k,p: key)
+        self.patch(windows, 'QueryValueEx', lambda k,p: path)
+
+        self.assertFailure(self.sdtool.start(), WindowsError)

=== modified file 'ubuntuone/platform/tools/windows.py'
--- ubuntuone/platform/tools/windows.py	2011-11-07 15:39:32 +0000
+++ ubuntuone/platform/tools/windows.py	2011-11-30 15:00:44 +0000
@@ -16,7 +16,10 @@
 
 """SyncDaemon Tools."""
 
+import errno
 import subprocess
+import sys
+import os
 
 from twisted.internet import defer
 from _winreg import OpenKey, HKEY_LOCAL_MACHINE, QueryValueEx
@@ -30,6 +33,11 @@
 U1_REG_PATH = r'Software\\Ubuntu One'
 SD_INSTALL_PATH = 'SyncDaemonInstallPath'
 
+# ugly trick to stop pylint for complaining about
+# WindowsError on Linux
+if sys.platform != 'win32':
+    WindowsError = None
+
 
 class IPCError(Exception):
     """An IPC specific error signal."""
@@ -154,5 +162,9 @@
         # to launch the sd on windows
         key = OpenKey(HKEY_LOCAL_MACHINE, U1_REG_PATH)
         path = QueryValueEx(key, SD_INSTALL_PATH)[0]
+        if not os.path.exists(path):
+            # either the .exe was moved of the value is wrong
+            return defer.fail(WindowsError(errno.ENOENT,
+                'Could not start syncdaemon: File not found %s' % path))
         p = subprocess.Popen([path])
         return defer.succeed(p)