Merge lp:~nataliabidart/magicicada-client/fix-tests-precise-networkstates into lp:magicicada-client

Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 1415
Merged at revision: 1413
Proposed branch: lp:~nataliabidart/magicicada-client/fix-tests-precise-networkstates
Merge into: lp:magicicada-client
Diff against target: 76 lines (+15/-11)
4 files modified
tests/platform/ipc/test_perspective_broker.py (+4/-2)
tests/syncdaemon/test_interaction_interfaces.py (+5/-4)
ubuntuone/proxy/tunnel_server.py (+4/-1)
ubuntuone/syncdaemon/interaction_interfaces.py (+2/-4)
To merge this branch: bzr merge lp:~nataliabidart/magicicada-client/fix-tests-precise-networkstates
Reviewer Review Type Date Requested Status
Natalia Bidart Approve
Review via email: mp+271753@code.launchpad.net

Commit message

- Backwards compatible ONLINE network state.
- One more ImportError fix for precise for fix_turkish_locale.

To post a comment you must log in.
1415. By Natalia Bidart

One more fix for ONLINE.

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Ran 2773 tests in 177.724s

PASSED (skips=43, successes=2730)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/platform/ipc/test_perspective_broker.py'
2--- tests/platform/ipc/test_perspective_broker.py 2015-09-19 21:04:46 +0000
3+++ tests/platform/ipc/test_perspective_broker.py 2015-09-20 15:29:48 +0000
4@@ -77,8 +77,10 @@
5 SharesClient,
6 )
7 from ubuntuone.syncdaemon import interaction_interfaces
8-
9-from ubuntu_sso.networkstate.networkstates import ONLINE
10+try:
11+ from ubuntu_sso.networkstate.networkstates import ONLINE
12+except ImportError:
13+ from ubuntu_sso.networkstate import ONLINE
14
15 TEST_PORT = 40404
16 TEST_DOMAIN_SOCKET = os.path.join(basedir.xdg_cache_home, 'ubuntuone', 'ipc')
17
18=== modified file 'tests/syncdaemon/test_interaction_interfaces.py'
19--- tests/syncdaemon/test_interaction_interfaces.py 2015-05-18 21:20:05 +0000
20+++ tests/syncdaemon/test_interaction_interfaces.py 2015-09-20 15:29:48 +0000
21@@ -33,10 +33,11 @@
22
23 from twisted.internet import defer
24 from ubuntuone.devtools.handlers import MementoHandler
25-from ubuntu_sso.networkstate.networkstates import ONLINE
26-from tests.platform.ipc.test_perspective_broker import (
27- FakeNetworkManagerState
28-)
29+try:
30+ from ubuntu_sso.networkstate.networkstates import ONLINE
31+except ImportError:
32+ from ubuntu_sso.networkstate import ONLINE
33+from tests.platform.ipc.test_perspective_broker import FakeNetworkManagerState
34
35 from contrib.testing.testcase import (
36 FakeCommand,
37
38=== modified file 'ubuntuone/proxy/tunnel_server.py'
39--- ubuntuone/proxy/tunnel_server.py 2015-09-19 23:15:50 +0000
40+++ ubuntuone/proxy/tunnel_server.py 2015-09-20 15:29:48 +0000
41@@ -59,7 +59,10 @@
42 from zope.interface import implements
43
44 from ubuntu_sso.keyring import Keyring
45-from ubuntu_sso.utils.locale import fix_turkish_locale
46+try:
47+ from ubuntu_sso.utils.locale import fix_turkish_locale
48+except ImportError:
49+ fix_turkish_locale = lambda: None
50 from ubuntu_sso.utils.webclient import gsettings
51 from ubuntuone.proxy.common import (
52 BaseTunnelProtocol,
53
54=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
55--- ubuntuone/syncdaemon/interaction_interfaces.py 2015-09-20 01:00:16 +0000
56+++ ubuntuone/syncdaemon/interaction_interfaces.py 2015-09-20 15:29:48 +0000
57@@ -50,9 +50,7 @@
58 try:
59 from ubuntu_sso.networkstate.networkstates import ONLINE
60 except ImportError:
61- class OnlineNetworkState(object):
62- label = 'online'
63- ONLINE = OnlineNetworkState()
64+ from ubuntu_sso.networkstate import ONLINE
65
66 from ubuntuone.logger import log_call
67 from ubuntuone.platform import credentials, ExternalInterface
68@@ -1331,7 +1329,7 @@
69 @log_call(logger.debug)
70 def network_state_changed(self, state):
71 """Receive the connection state and call the proper function."""
72- if state.label == ONLINE.label:
73+ if state == ONLINE:
74 self.network_connected()
75 else:
76 self.network_disconnected()

Subscribers

People subscribed via source and target branches

to all changes: