diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-08-16 17:25:17 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-13 12:33:36 +0100 |
| commit | edfd9b291e81bb935054c5ab7102a1b2120d0333 (patch) | |
| tree | 9810b4df9455515bcbd2898efaa27e948b8f939e | |
| parent | 2c9d469ec6646a39bd964866b434e0eaafab2b24 (diff) | |
| download | telepathy-mission-control-edfd9b291e81bb935054c5ab7102a1b2120d0333.tar.gz | |
Tests: remove stale FIXMEs about closing channels
Since 5dfe2f0, Mission Control has not called Close() on channels when
you disconnect. The test for this incorrect behaviour was commented out
at some point, with a FIXME that the behaviour should be changed.
Well, now the behaviour has been changed. So I replaced one with an
assertion that Close() is not called, and the other I just removed
(since that test doesn't actually have any channels).
| -rw-r--r-- | tests/twisted/account-manager/reconnect.py | 5 | ||||
| -rw-r--r-- | tests/twisted/account-manager/request-online.py | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/tests/twisted/account-manager/reconnect.py b/tests/twisted/account-manager/reconnect.py index 16a19ba7..44af4100 100644 --- a/tests/twisted/account-manager/reconnect.py +++ b/tests/twisted/account-manager/reconnect.py @@ -192,11 +192,6 @@ def test(q, bus, mc): q.expect('dbus-method-call', method='Disconnect', path=conn.object_path, handled=True) - # MC terminates the channel - # FIXME: it shouldn't do this! - #q.expect('dbus-method-call', method='Close', - # path=chan.object_path, handled=True) - properties = account.GetAll(cs.ACCOUNT, dbus_interface=cs.PROPERTIES_IFACE) assert properties['Connection'] == '/' assert properties['ConnectionStatus'] == cs.CONN_STATUS_DISCONNECTED diff --git a/tests/twisted/account-manager/request-online.py b/tests/twisted/account-manager/request-online.py index 83f34f43..3d8a6016 100644 --- a/tests/twisted/account-manager/request-online.py +++ b/tests/twisted/account-manager/request-online.py @@ -151,15 +151,14 @@ def test(q, bus, mc): 'RequestedPresence', requested_presence, dbus_interface=cs.PROPERTIES_IFACE) - # In response, MC tells us to Disconnect, and we do + # In response, MC tells us to Disconnect, and we do. But it should not + # Close() the open channel. + q.forbid_events([ + EventPattern('dbus-method-call', method='Close', path=conn.object_path), + ]) q.expect('dbus-method-call', method='Disconnect', path=conn.object_path, handled=True) - # MC terminates the channel - # FIXME: it shouldn't do this! - #q.expect('dbus-method-call', method='Close', - # path=chan.object_path, handled=True) - properties = account.GetAll(cs.ACCOUNT, dbus_interface=cs.PROPERTIES_IFACE) assertEquals('/', properties['Connection']) assertEquals(cs.CONN_STATUS_DISCONNECTED, properties['ConnectionStatus']) |