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

Proposed by Eric Casteleijn
Status: Merged
Approved by: Eric Casteleijn
Approved revision: 1029
Merged at revision: 1028
Proposed branch: lp:~thisfred/ubuntuone-client/fix-linux-detection
Merge into: lp:ubuntuone-client
Diff against target: 121 lines (+17/-17)
7 files modified
tests/platform/__init__.py (+10/-10)
tests/platform/linux/eventlog/test_zg_listener.py (+1/-1)
tests/platform/linux/test_dbus.py (+1/-1)
tests/platform/linux/test_filesystem_notifications.py (+1/-1)
tests/platform/test_platform.py (+2/-2)
ubuntuone/platform/linux/__init__.py (+1/-1)
ubuntuone/platform/linux/vm_helper.py (+1/-1)
To merge this branch: bzr merge lp:~thisfred/ubuntuone-client/fix-linux-detection
Reviewer Review Type Date Requested Status
Natalia Bidart Approve
Review via email: mp+66208@code.launchpad.net

Commit message

* Fixes linux detection (LP: #803062)

Description of the change

* Fixes linux detection (LP: #803062)

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
33
4setup_action_queue_test = None4setup_action_queue_test = None
5setup_main_test = None5setup_main_test = None
6get_main_params = None 6get_main_params = None
7_GeneralINotifyProcessor = None7_GeneralINotifyProcessor = None
8platform_mangled_path = None8platform_mangled_path = None
9IPCTestCase = None9IPCTestCase = None
1010
11if sys.platform == 'linux2':11if sys.platform.startswith('linux'):
12 from tests.platform import linux as linux_test12 from tests.platform import linux as linux_test
13 setup_action_queue_test = linux_test.setup_action_queue_test 13 setup_action_queue_test = linux_test.setup_action_queue_test
14 setup_main_test = linux_test.setup_main_test 14 setup_main_test = linux_test.setup_main_test
15 get_main_params = linux_test.get_main_params15 get_main_params = linux_test.get_main_params
16 platform_mangled_path = linux_test.platform_mangled_path 16 platform_mangled_path = linux_test.platform_mangled_path
17 from ubuntuone.platform.linux import filesystem_notifications17 from ubuntuone.platform.linux import filesystem_notifications
18 _GeneralINotifyProcessor = filesystem_notifications._GeneralINotifyProcessor18 _GeneralINotifyProcessor = filesystem_notifications._GeneralINotifyProcessor
19 from tests.platform.linux.test_dbus import DBusTwistedTestCase19 from tests.platform.linux.test_dbus import DBusTwistedTestCase
20 IPCTestCase = DBusTwistedTestCase20 IPCTestCase = DBusTwistedTestCase
21else:21else:
22 from tests.platform import windows as windows_test22 from tests.platform import windows as windows_test
23 setup_action_queue_test = windows_test.setup_action_queue_test 23 setup_action_queue_test = windows_test.setup_action_queue_test
24 setup_main_test = windows_test.setup_main_test 24 setup_main_test = windows_test.setup_main_test
25 get_main_params = windows_test.get_main_params 25 get_main_params = windows_test.get_main_params
26 platform_mangled_path = windows_test.platform_mangled_path 26 platform_mangled_path = windows_test.platform_mangled_path
27 from ubuntuone.platform.windows import filesystem_notifications27 from ubuntuone.platform.windows import filesystem_notifications
28 _GeneralINotifyProcessor = filesystem_notifications.NotifyProcessor 28 _GeneralINotifyProcessor = filesystem_notifications.NotifyProcessor
29 from tests.platform.windows.test_ipc import PerspectiveBrokerTestCase29 from tests.platform.windows.test_ipc import PerspectiveBrokerTestCase
30 IPCTestCase = PerspectiveBrokerTestCase30 IPCTestCase = PerspectiveBrokerTestCase
3131
3232
=== 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 @@
1223def test_suite():1223def test_suite():
1224 """Collect these tests only on linux."""1224 """Collect these tests only on linux."""
1225 import sys1225 import sys
1226 if sys.platform == 'linux2':1226 if sys.platform.startswith('linux'):
1227 tests = unittest.TestLoader().loadTestsFromName(__name__)1227 tests = unittest.TestLoader().loadTestsFromName(__name__)
1228 else:1228 else:
1229 tests = []1229 tests = []
12301230
=== 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 @@
3982def test_suite():3982def test_suite():
3983 """Collect these tests only on linux."""3983 """Collect these tests only on linux."""
3984 import sys3984 import sys
3985 if sys.platform == 'linux2':3985 if sys.platform.startswith('linux'):
3986 tests = unittest.TestLoader().loadTestsFromName(__name__)3986 tests = unittest.TestLoader().loadTestsFromName(__name__)
3987 else:3987 else:
3988 tests = []3988 tests = []
39893989
=== 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 @@
404def test_suite():404def test_suite():
405 """Collect the tests."""405 """Collect the tests."""
406 import sys406 import sys
407 if sys.platform == 'linux2':407 if sys.platform.startswith('linux'):
408 tests = unittest.TestLoader().loadTestsFromName(__name__)408 tests = unittest.TestLoader().loadTestsFromName(__name__)
409 else:409 else:
410 tests = []410 tests = []
411411
=== 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 @@
77
8 def test_import(self):8 def test_import(self):
9 """Make sure we can import the platform module."""9 """Make sure we can import the platform module."""
10 10
11 import ubuntuone.platform as uplt11 import ubuntuone.platform as uplt
12 self.assertEqual(uplt.platform, sys.platform)12 self.assertTrue(sys.platform.startswith(uplt.platform))
1313
=== 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 @@
20This module has to have all linux specific modules and provide the api required20This module has to have all linux specific modules and provide the api required
21to support the linux platform."""21to support the linux platform."""
2222
23platform = "linux2"23platform = "linux"
2424
25import dbus25import dbus
26from dbus.mainloop.glib import DBusGMainLoop26from dbus.mainloop.glib import DBusGMainLoop
2727
=== 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 @@
19import os19import os
2020
2121
22platform = "linux2"22platform = "linux"
2323
2424
25def create_shares_link(source, dest):25def create_shares_link(source, dest):

Subscribers

People subscribed via source and target branches