Merge lp:~thisfred/ubuntuone-client/fix-linux-detection into lp:ubuntuone-client

[Eric Casteleijn]

* Fixes linux detection (LP: #803062)

* Fixes linux detection (LP: #803062)

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'tests/platform/__init__.py'
--- tests/platform/__init__.py	2011-02-15 11:31:40 +0000
+++ tests/platform/__init__.py	2011-06-28 21:29:30 +0000
@@ -3,29 +3,29 @@
 
 setup_action_queue_test = None
 setup_main_test = None
-get_main_params = None 
+get_main_params = None
 _GeneralINotifyProcessor = None
 platform_mangled_path = None
 IPCTestCase = None
 
-if sys.platform == 'linux2':
+if sys.platform.startswith('linux'):
     from tests.platform import linux as linux_test
-    setup_action_queue_test = linux_test.setup_action_queue_test 
-    setup_main_test = linux_test.setup_main_test 
+    setup_action_queue_test = linux_test.setup_action_queue_test
+    setup_main_test = linux_test.setup_main_test
     get_main_params = linux_test.get_main_params
-    platform_mangled_path = linux_test.platform_mangled_path 
+    platform_mangled_path = linux_test.platform_mangled_path
     from ubuntuone.platform.linux import filesystem_notifications
     _GeneralINotifyProcessor = filesystem_notifications._GeneralINotifyProcessor
     from tests.platform.linux.test_dbus import DBusTwistedTestCase
     IPCTestCase = DBusTwistedTestCase
 else:
     from tests.platform import windows as windows_test
-    setup_action_queue_test = windows_test.setup_action_queue_test 
-    setup_main_test = windows_test.setup_main_test 
-    get_main_params = windows_test.get_main_params 
-    platform_mangled_path = windows_test.platform_mangled_path 
+    setup_action_queue_test = windows_test.setup_action_queue_test
+    setup_main_test = windows_test.setup_main_test
+    get_main_params = windows_test.get_main_params
+    platform_mangled_path = windows_test.platform_mangled_path
     from ubuntuone.platform.windows import filesystem_notifications
-    _GeneralINotifyProcessor = filesystem_notifications.NotifyProcessor 
+    _GeneralINotifyProcessor = filesystem_notifications.NotifyProcessor
     from tests.platform.windows.test_ipc import PerspectiveBrokerTestCase
     IPCTestCase = PerspectiveBrokerTestCase
 
 
=== modified file 'tests/platform/linux/eventlog/test_zg_listener.py'
--- tests/platform/linux/eventlog/test_zg_listener.py	2011-06-15 19:05:22 +0000
+++ tests/platform/linux/eventlog/test_zg_listener.py	2011-06-28 21:29:30 +0000
@@ -1223,7 +1223,7 @@
 def test_suite():
     """Collect these tests only on linux."""
     import sys
-    if sys.platform == 'linux2':
+    if sys.platform.startswith('linux'):
         tests = unittest.TestLoader().loadTestsFromName(__name__)
     else:
         tests = []
 
=== modified file 'tests/platform/linux/test_dbus.py'
--- tests/platform/linux/test_dbus.py	2011-06-16 20:42:09 +0000
+++ tests/platform/linux/test_dbus.py	2011-06-28 21:29:30 +0000
@@ -3982,7 +3982,7 @@
 def test_suite():
     """Collect these tests only on linux."""
     import sys
-    if sys.platform == 'linux2':
+    if sys.platform.startswith('linux'):
         tests = unittest.TestLoader().loadTestsFromName(__name__)
     else:
         tests = []
 
=== modified file 'tests/platform/linux/test_filesystem_notifications.py'
--- tests/platform/linux/test_filesystem_notifications.py	2011-02-21 17:29:02 +0000
+++ tests/platform/linux/test_filesystem_notifications.py	2011-06-28 21:29:30 +0000
@@ -404,7 +404,7 @@
 def test_suite():
     """Collect the tests."""
     import sys
-    if sys.platform == 'linux2':
+    if sys.platform.startswith('linux'):
         tests = unittest.TestLoader().loadTestsFromName(__name__)
     else:
         tests = []
 
=== modified file 'tests/platform/test_platform.py'
--- tests/platform/test_platform.py	2010-11-29 20:21:45 +0000
+++ tests/platform/test_platform.py	2011-06-28 21:29:30 +0000
@@ -7,6 +7,6 @@
 
     def test_import(self):
         """Make sure we can import the platform module."""
-        
+
         import ubuntuone.platform as uplt
-        self.assertEqual(uplt.platform, sys.platform)
+        self.assertTrue(sys.platform.startswith(uplt.platform))
 
=== modified file 'ubuntuone/platform/linux/__init__.py'
--- ubuntuone/platform/linux/__init__.py	2011-06-16 14:30:29 +0000
+++ ubuntuone/platform/linux/__init__.py	2011-06-28 21:29:30 +0000
@@ -20,7 +20,7 @@
 This module has to have all linux specific modules and provide the api required
 to support the linux platform."""
 
-platform = "linux2"
+platform = "linux"
 
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
 
=== modified file 'ubuntuone/platform/linux/vm_helper.py'
--- ubuntuone/platform/linux/vm_helper.py	2011-06-16 14:30:29 +0000
+++ ubuntuone/platform/linux/vm_helper.py	2011-06-28 21:29:30 +0000
@@ -19,7 +19,7 @@
 import os
 
 
-platform = "linux2"
+platform = "linux"
 
 
 def create_shares_link(source, dest):