Merge lp:~mikemc/ubuntuone-client/fix-1013261-darwins-got-credentials into lp:ubuntuone-client

[Mike McCracken]

- use correct IPC mechanism on darwin for credentials (lp:1013268)

- use correct IPC mechanism on darwin for credentials (lp:1013268)

Also rename some modules because darwin and windows use the same ipc.

all tests pass on linux.
on macos and windows, only a subset of tests run*, but the relevant ones pass:

mac: ./run-mac-tests tests/platform/credentials
windows: u1trial --reactor=twisted -c -p tests\platform\linux -i "test_linux.py,test_darwin.py" tests\platform

[Manuel de la Peña (mandel)]

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== renamed file 'tests/platform/credentials/test_windows.py' => 'tests/platform/credentials/test_ipc_service.py'
--- tests/platform/credentials/test_windows.py	2012-05-14 19:04:43 +0000
+++ tests/platform/credentials/test_ipc_service.py	2012-06-14 22:35:22 +0000
@@ -38,7 +38,7 @@
 from contrib.testing.testcase import FAKED_CREDENTIALS
 from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.platform.credentials import APP_NAME
-from ubuntuone.platform.credentials.windows import (
+from ubuntuone.platform.credentials.ipc_service import (
     CredentialsManagement,
     RemovableSignal,
     logger,

=== modified file 'tests/platform/credentials/test_linux.py'
--- tests/platform/credentials/test_linux.py	2012-05-24 19:10:30 +0000
+++ tests/platform/credentials/test_linux.py	2012-06-14 22:35:22 +0000
@@ -46,7 +46,7 @@
     logger,
     UI_PARAMS,
 )
-from ubuntuone.platform.credentials.linux import (
+from ubuntuone.platform.credentials.dbus_service import (
     APP_NAME,
     CredentialsManagement,
     dbus,

=== modified file 'ubuntuone/platform/credentials/__init__.py'
--- ubuntuone/platform/credentials/__init__.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/credentials/__init__.py	2012-06-14 22:35:22 +0000
@@ -138,12 +138,12 @@
 
     def get_platform_source(self):
         """Platform-specific source."""
-        if sys.platform == 'win32':
-            from ubuntuone.platform.credentials import windows
-            source = windows
+        if sys.platform in ('win32', 'darwin'):
+            from ubuntuone.platform.credentials import ipc_service
+            source = ipc_service
         else:
-            from ubuntuone.platform.credentials import linux
-            source = linux
+            from ubuntuone.platform.credentials import dbus_service
+            source = dbus_service
         return source
 
     @defer.inlineCallbacks

=== renamed file 'ubuntuone/platform/credentials/linux.py' => 'ubuntuone/platform/credentials/dbus_service.py'
=== renamed file 'ubuntuone/platform/credentials/windows.py' => 'ubuntuone/platform/credentials/ipc_service.py'