Merge lp:~alecu/ubuntuone-client/use-standard-reactor into lp:ubuntuone-client

[Alejandro J. Cura]

Use the standard reactor on windows. (LP: #803640)

Use the standard reactor on windows. (LP: #803640)

[John Lenton (chipaca)]

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'bin/ubuntuone-syncdaemon'
--- bin/ubuntuone-syncdaemon	2011-06-21 17:01:47 +0000
+++ bin/ubuntuone-syncdaemon	2011-06-30 21:21:22 +0000
@@ -21,8 +21,8 @@
 import sys
 
 if sys.platform == 'win32':
-    from txnamedpipes.reactor import install
-    install()
+    # use the standard reactor on windows
+    pass
 else:
     from twisted.internet import glib2reactor
     glib2reactor.install()

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-06-22 03:49:08 +0000
+++ run-tests.bat	2011-06-30 21:21:22 +0000
@@ -52,7 +52,7 @@
 ECHO Python found, executing the tests...
 COPY windows\clientdefs.py ubuntuone\clientdefs.py
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONPATH%\python.exe" "%PYTHONPATH%\Scripts\u1trial" --reactor=txnp -c tests -p tests\platform\linux %1
+"%PYTHONPATH%\python.exe" "%PYTHONPATH%\Scripts\u1trial" --reactor=twisted -c tests -p tests\platform\linux %1
 "%PYTHONPATH%\python.exe" "%PYTHONPATH%\Scripts\u1lint"
 :: test for style if we can, if pep8 is not present, move to the end
 IF EXIST "%PYTHONPATH%Scripts\pep8.exe"

=== modified file 'tests/platform/windows/run_sdtool.py'
--- tests/platform/windows/run_sdtool.py	2011-06-27 14:58:10 +0000
+++ tests/platform/windows/run_sdtool.py	2011-06-30 21:21:22 +0000
@@ -17,8 +17,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Small example of how to use the sdtools on windows."""
 
-from txnamedpipes.reactor import install
-install()
+# we use the standard reactor on windows
 from twisted.internet import reactor, defer
 from ubuntuone.platform.windows import tools
 
@@ -55,4 +54,4 @@
 
 if __name__ == '__main__':
     reactor.callLater(0, print_test)
-    reactor.run()
\ No newline at end of file
+    reactor.run()

=== modified file 'tests/platform/windows/test_ipc.py'
--- tests/platform/windows/test_ipc.py	2011-06-30 19:05:16 +0000
+++ tests/platform/windows/test_ipc.py	2011-06-30 21:21:22 +0000
@@ -58,15 +58,15 @@
     SharesClient
 )
 
-TEST_PIPE_URL = "\\\\.\\pipe\\ubuntuone_sso\\tests_%s"
+TEST_HOST_PORT = "127.0.0.1", 40404
 
 
 class BaseIPCTestCase(TestCase):
-    """Set the ipc to a random port/pipe for this instance."""
+    """Set the ipc to a random port for this instance."""
 
     def setUp(self):
         """Initialize this test instance."""
-        self.patch(ipc, "NAMED_PIPE_URL", TEST_PIPE_URL)
+        self.patch(ipc, "HOST_PORT", TEST_HOST_PORT)
 
 
 class SaveProtocolServerFactory(PBServerFactory):

=== modified file 'tests/platform/windows/test_tools.py'
--- tests/platform/windows/test_tools.py	2011-06-30 20:00:25 +0000
+++ tests/platform/windows/test_tools.py	2011-06-30 21:21:22 +0000
@@ -42,7 +42,7 @@
     SyncDaemonTool,
 )
 
-TEST_TOOLS_PIPE_URL = "\\\\.\\pipe\\ubuntuone_sso\\test_tools_%s"
+TEST_TOOLS_HOST_PORT = "127.0.0.1", 40405
 
 
 class SaveProtocolServerFactory(PBServerFactory):
@@ -135,7 +135,7 @@
                                         self.folders, self.files)
         self.server_factory = SaveProtocolServerFactory(self.syncdaemon_root)
         # pylint: disable=E1101
-        self.patch(ipc, "NAMED_PIPE_URL", TEST_TOOLS_PIPE_URL)
+        self.patch(ipc, "HOST_PORT", TEST_TOOLS_HOST_PORT)
         self.listener = ipc_server_listen(self.server_factory)
         self.sdtool = SyncDaemonTool()
 

=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2011-06-30 19:05:16 +0000
+++ ubuntuone/platform/windows/__init__.py	2011-06-30 21:21:22 +0000
@@ -106,10 +106,6 @@
 
 def is_already_running():
     """Return if the sd is running by asking the named pipe."""
-    from win32pipe import CallNamedPipe
-    from ubuntuone.platform.windows.ipc import get_pipe_name
-    try:
-        CallNamedPipe(get_pipe_name(), '', 512, 0)
-        return True
-    except:
-        return False
+    #TODO: Do not start two instances of this process
+    #      https://launchpad.net/bugs/803672
+    return False

=== modified file 'ubuntuone/platform/windows/ipc.py'
--- ubuntuone/platform/windows/ipc.py	2011-06-30 19:05:16 +0000
+++ ubuntuone/platform/windows/ipc.py	2011-06-30 21:21:22 +0000
@@ -21,8 +21,6 @@
 import logging
 
 from threading import Thread
-from win32api import GetUserNameEx
-from win32con import NameSamCompatible
 
 from twisted.internet import defer, reactor
 from twisted.spread.pb import Referenceable, Root, PBServerFactory
@@ -45,25 +43,27 @@
 )
 
 logger = logging.getLogger("ubuntuone.SyncDaemon.Pb")
-NAMED_PIPE_URL = "\\\\.\\pipe\\ubuntuone_client\\%s"
+HOST_PORT = "127.0.0.1", 50002
 CLIENT_NOT_PROCESSED = -1
 
 
-def get_pipe_name():
-    """Builds the pipe name for this user."""
-    return NAMED_PIPE_URL % GetUserNameEx(NameSamCompatible)
+def get_sd_pb_hostport():
+    """Returns the host and port for this user."""
+    return HOST_PORT
 
 
 def ipc_server_listen(server_factory):
     """Connect the IPC server factory."""
+    host, port = get_sd_pb_hostport()
     # pylint: disable=E1101
-    return reactor.listenPipe(get_pipe_name(), server_factory)
+    return reactor.listenTCP(port, server_factory, interface=host)
 
 
 def ipc_client_connect(client_factory):
     """Connect the IPC client factory."""
+    host, port = get_sd_pb_hostport()
     # pylint: disable=E1101
-    return reactor.connectPipe(get_pipe_name(), client_factory)
+    return reactor.connectTCP(host, port, client_factory)
 
 
 class NoAccessToken(Exception):

=== modified file 'ubuntuone/platform/windows/ipc_client.py'
--- ubuntuone/platform/windows/ipc_client.py	2011-06-30 19:05:16 +0000
+++ ubuntuone/platform/windows/ipc_client.py	2011-06-30 21:21:22 +0000
@@ -730,7 +730,7 @@
             defer.returnValue(self)
         except Exception, e:
             raise SyncDaemonClientConnectionError(
-                            'Could not connect to the syncdaemon on pipe.', e)
+                            'Could not connect to the syncdaemon ipc.', e)
         # pylint: disable=W0702
 
     @defer.inlineCallbacks

=== modified file 'ubuntuone/platform/windows/tools.py'
--- ubuntuone/platform/windows/tools.py	2011-06-30 19:20:39 +0000
+++ ubuntuone/platform/windows/tools.py	2011-06-30 21:21:22 +0000
@@ -24,13 +24,10 @@
 import subprocess
 import sys
 
-from win32api import CloseHandle
-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 get_pipe_name
 from ubuntuone.platform.windows.ipc_client import UbuntuOneClient
 
 U1_REG_PATH = r'Software\\Ubuntu One'
@@ -42,14 +39,9 @@
     Running means the name is registered in the given bus.
 
     """
-    pipe = get_pipe_name()
-    try:
-        handle = CreateFile(pipe, GENERIC_READ, FILE_SHARE_READ, None,
-                            OPEN_EXISTING, 0,None)
-        CloseHandle(handle)
-        return True
-    except:
-        return False
+    #TODO: Do not start two instances of this process
+    #      https://launchpad.net/bugs/803672
+    return False
 
 
 class SyncDaemonTool(object):