diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-08 13:42:40 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-13 12:20:08 +0000 |
| commit | d623a5e4764c3c199eb5497df613a44428b53c14 (patch) | |
| tree | 504f5f767c8f451ec182523b86011b10335f7366 | |
| parent | 235a865d586974019c719a91398e9c214073926a (diff) | |
constants: remove obsolete and duplicate lines
In the process, get rid of some now-redundant test code that relied on
CHANNEL_TYPE_CONTACT_LIST still existing.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=50093
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
| -rw-r--r-- | tests/twisted/constants.py | 2 | ||||
| -rw-r--r-- | tests/twisted/jingle/call_helper.py | 4 | ||||
| -rw-r--r-- | tests/twisted/jingle/stun-server.py | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py index a624ab085..d7105294b 100644 --- a/tests/twisted/constants.py +++ b/tests/twisted/constants.py @@ -51,7 +51,6 @@ CHANNEL_IFACE_SUBJECT = CHANNEL + '.Interface.Subject1' CHANNEL_IFACE_FILE_TRANSFER_METADATA = CHANNEL + '.Interface.FileTransfer.Metadata1' CHANNEL_TYPE_CALL = CHANNEL + ".Type.Call1" -CHANNEL_TYPE_CONTACT_LIST = CHANNEL + ".Type.ContactList1" CHANNEL_TYPE_CONTACT_SEARCH = CHANNEL + ".Type.ContactSearch1" CHANNEL_TYPE_TEXT = CHANNEL + ".Type.Text" CHANNEL_TYPE_STREAM_TUBE = CHANNEL + ".Type.StreamTube1" @@ -208,7 +207,6 @@ ATTR_AVATAR_TOKEN = CONN_IFACE_AVATARS + '/token' ATTR_CLIENT_TYPES = CONN_IFACE_CLIENT_TYPES + '/client-types' ATTR_CONTACT_CAPABILITIES = CONN_IFACE_CONTACT_CAPS + '/capabilities' ATTR_CONTACT_ID = CONN + '/contact-id' -ATTR_CONTACT_ID = CONN + '/contact-id' ATTR_CONTACT_INFO = CONN_IFACE_CONTACT_INFO + '/info' ATTR_GROUPS = CONN_IFACE_CONTACT_GROUPS + '/groups' ATTR_LOCATION = CONN_IFACE_LOCATION + '/location' diff --git a/tests/twisted/jingle/call_helper.py b/tests/twisted/jingle/call_helper.py index 76f595322..5c65706e4 100644 --- a/tests/twisted/jingle/call_helper.py +++ b/tests/twisted/jingle/call_helper.py @@ -286,9 +286,7 @@ class CallTest(object): cs.CALL_INITIAL_VIDEO: self.initial_video, }) - signal = self.q.expect('dbus-signal', signal='NewChannels', - predicate=lambda e: - cs.CHANNEL_TYPE_CONTACT_LIST not in e.args[0][0][1].values()) + signal = self.q.expect('dbus-signal', signal='NewChannels') assertLength(1, signal.args) assertLength(1, signal.args[0]) # one channel diff --git a/tests/twisted/jingle/stun-server.py b/tests/twisted/jingle/stun-server.py index ab7c538ce..6fb471174 100644 --- a/tests/twisted/jingle/stun-server.py +++ b/tests/twisted/jingle/stun-server.py @@ -108,8 +108,7 @@ def test_call(jp, q, bus, conn, stream, assertLength(0, e.args) assertEquals(e.interface, cs.CALL_STREAM_IFACE_MEDIA) - e = q.expect('dbus-signal', signal='NewChannels', - predicate=lambda e: cs.CHANNEL_TYPE_CONTACT_LIST not in e.args) + e = q.expect('dbus-signal', signal='NewChannels') assert e.args[0][0][0] call_chan = make_channel_proxy(conn, e.args[0][0][0], 'Channel') |