[Telepathy-commits] [telepathy-gabble/master] Delete vcard/test-vcard-set-and-get.py

[Will Thompson]

It doesn't test anything useful that's not tested elsewhere.

It tests that RequestAvatar waits for the vCard to be retrieved before
returning or erroring, but that's already tested in test-avatar.py and
test-vcard-cache.py respectively.

It also somewhat tests that making two updates simultaneously works,
but that's tested in test-vcard-race.py (which doesn't actually test a
race! :D).
---
 tests/twisted/Makefile.am                     |    1 -
 tests/twisted/vcard/test-vcard-set-and-get.py |  105 -------------------------
 2 files changed, 0 insertions(+), 106 deletions(-)
 delete mode 100644 tests/twisted/vcard/test-vcard-set-and-get.py

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 4bf0d67..267de69 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -69,7 +69,6 @@ TWISTED_TESTS = \
 	vcard/test-set-alias.py \
 	vcard/test-vcard-cache.py \
 	vcard/test-vcard-race.py \
-	vcard/test-vcard-set-and-get.py \
 	jingle/accept-extra-stream.py \
 	jingle/google-relay.py \
 	jingle/hold-audio.py \
diff --git a/tests/twisted/vcard/test-vcard-set-and-get.py b/tests/twisted/vcard/test-vcard-set-and-get.py
deleted file mode 100644
index f1fe09b..0000000
--- a/tests/twisted/vcard/test-vcard-set-and-get.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""
-Test what happens if there's a timeout in getting vcard request.
-"""
-
-import base64
-import time
-
-import dbus
-
-from servicetest import call_async, lazy, match, tp_name_prefix, unwrap
-from gabbletest import go, handle_get_vcard, handle_set_vcard
-
-from twisted.words.xish import xpath
-from twisted.words.xish import domish
-from twisted.words.protocols.jabber.client import IQ
-
-def aliasing_iface(proxy):
-    return dbus.Interface(proxy, tp_name_prefix +
-        '.Connection.Interface.Aliasing')
-
-def avatars_iface(proxy):
-    return dbus.Interface(proxy, tp_name_prefix +
-        '.Connection.Interface.Avatars')
-
- at lazy
- at match('stream-iq')
-def expect_get_inital_vcard(event, data):
-    return handle_get_vcard(event, data)
-    pass
-
-# Make two edits (alias, avatar) and request avatar again.
-# Cache should be invalidated, a new GET request made, then
-# RequestAvatar should return with the newly returned (NOT patched)
-# avatar, and server should receive SET request.
-
- at match('dbus-signal', signal='StatusChanged', args=[0, 1])
-def expect_connected(event, data):
-
-    handle = data['conn_iface'].GetSelfHandle()
-    data['self_handle'] = handle
-
-    call_async(data['test'], aliasing_iface(data['conn']),
-               'SetAliases', {handle: 'Some Guy'})
-    call_async(data['test'], avatars_iface(data['conn']),
-               'SetAvatar', 'hello', 'image/png')
-    call_async(data['test'], avatars_iface(data['conn']),
-                'RequestAvatar', handle)
-
-    return True
-
-
-# Gabble has invalidate its cache and asks us for our vcard (this
-# is for the first edit call, the second will reuse the same reply)
-#@match('stream-iq')
-#def expect_get_vcard(event, data):
-#    if event.stanza['type'] != 'get':
-#        return False
-#    data['stream'].send(' ')
-#    # time.sleep(1) # give gabble chance to process the other Set request...
-#    return handle_get_vcard(event, data)
-
- at lazy
- at match('stream-iq')
-def expect_set_vcard(event, data):
-    return handle_set_vcard(event, data)
-
-# We *still* don't have photo in the vCard
- at match('dbus-error', method='RequestAvatar')
-def expect_avatar_error2(event, data):
-    assert event.error.args[0] == 'contact vCard has no photo'
-    return True
-
-# Only after we get AvatarUpdated with the new
-# token, we should be able to request new avatar
- at match('dbus-signal', signal='AvatarUpdated')
-def expect_avatar_updated(event, data):
-    if event.args[1] == u'':
-        return False
-    handle = data['self_handle']
-    call_async(data['test'], avatars_iface(data['conn']),
-                'RequestAvatar', handle)
-
-    return True
-
- at match('dbus-return', method='RequestAvatar')
-def expect_avatar_error3(event, data):
-    assert unwrap(event.value)[1] == 'image/png'
-    data['conn_iface'].Disconnect()
-    return True
-
-
-# FIXME - one possible problem with the test is that gabble might
-# be too fast for us, so set aliases will immediately get, patch, set vcard,
-# before gabble gets setavatar. So if the test hangs, this might be the cause.
-
-### TODO - more tests here
-
-
- at match('dbus-signal', signal='StatusChanged', args=[2, 1])
-def expect_disconnected(event, data):
-    return True
-
-if __name__ == '__main__':
-    go()
-
-- 
1.5.6.5