diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-27 17:15:46 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-28 11:32:20 +0100 |
| commit | ca9833b3d208fa4f4f3af333ebca54178c5c62da (patch) | |
| tree | 680b7d46d121b494285b494c26a02827b7122797 | |
| parent | 855af5f3bb9f70aaa59768dbeaf50edf68198675 (diff) | |
am/connectivity: extract BillyIdle
| -rw-r--r-- | tests/twisted/account-manager/connectivity.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/twisted/account-manager/connectivity.py b/tests/twisted/account-manager/connectivity.py index e102a26e..0749061c 100644 --- a/tests/twisted/account-manager/connectivity.py +++ b/tests/twisted/account-manager/connectivity.py @@ -34,6 +34,17 @@ if not config.HAVE_CONNECTIVITY: print "NOTE: built without ConnMan or NM support" raise SystemExit(77) +def sync_connectivity_state(mc): + # We cannot simply use sync_dbus here, because nm-glib reports property + # changes in an idle (presumably to batch them all together). This is fine + # and all that, but means we have to find a way to make sure MC has flushed + # its idle queue to avoid this test being racy. (This isn't just + # theoretical: this test failed about once per five runs when it used sync_dbus.) + # + # The test-specific version of MC implements the 'BillyIdle' method, which + # returns from a low-priority idle. + mc.BillyIdle(dbus_interface='org.freedesktop.Telepathy.MissionControl5.RegressionTests') + def test(q, bus, mc): params = dbus.Dictionary( {"account": "yum yum network manager", @@ -99,16 +110,7 @@ def test(q, bus, mc): mc.connectivity.go_offline() # Make sure that MC has noticed that the network connection has gone away. - # - # We cannot simply use sync_dbus here, because nm-glib reports property - # changes in an idle (presumably to batch them all together). This is fine - # and all that, but means we have to find a way to make sure MC has flushed - # its idle queue to avoid this test being racy. (This isn't just - # theoretical: this test failed about once per five runs when it used sync_dbus.) - # - # The test-specific version of MC implements the 'BillyIdle' method, which - # returns from a low-priority idle. - mc.BillyIdle(dbus_interface='org.freedesktop.Telepathy.MissionControl5.RegressionTests') + sync_connectivity_state(mc) conn = SimulatedConnection(q, bus, 'fakecm', 'fakeprotocol', account.object_path.split('/')[-1], 'myself') |