[Telepathy-commits] [telepathy-gabble/master] Remove unused imports from wait-for-caps tests

[Will Thompson]

Also, misc tidying.
---
 .../jingle/test-wait-for-caps-incomplete.py        |   16 ++--------------
 tests/twisted/jingle/test-wait-for-caps.py         |    8 ++------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/tests/twisted/jingle/test-wait-for-caps-incomplete.py b/tests/twisted/jingle/test-wait-for-caps-incomplete.py
index 1f65411..e8eeb8b 100644
--- a/tests/twisted/jingle/test-wait-for-caps-incomplete.py
+++ b/tests/twisted/jingle/test-wait-for-caps-incomplete.py
@@ -1,28 +1,18 @@
-
 """
 Test that Gabble properly cleans up delayed RequestStream contexts
 and returns an error when Disconnect is called and there are
 incomplete requests.
 """
 
-from gabbletest import exec_test, make_result_iq, sync_stream
-from servicetest import make_channel_proxy, unwrap, tp_path_prefix, \
-        call_async, EventPattern, sync_dbus
-from twisted.words.xish import domish
+from gabbletest import exec_test
+from servicetest import make_channel_proxy, call_async, sync_dbus
 import jingletest
-import gabbletest
-import dbus
-import time
 
 import constants as cs
 
 def test(q, bus, conn, stream):
     jt = jingletest.JingleTest(stream, 'test at localhost', 'foo at bar.com/Foo')
 
-    # If we need to override remote caps, feats, codecs or caps,
-    # this is a good time to do it
-
-    # Connecting
     conn.Connect()
 
     q.expect('dbus-signal', signal='StatusChanged', args=[1, 1])
@@ -32,8 +22,6 @@ def test(q, bus, conn, stream):
         args=[{1L: (0L, {u'available': {}})}])
     q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
 
-    self_handle = conn.GetSelfHandle()
-
     # We intentionally DON'T set remote presence yet. Since Gabble is still
     # unsure whether to treat contact as offline for this purpose, it
     # will tentatively allow channel creation and contact handle addition
diff --git a/tests/twisted/jingle/test-wait-for-caps.py b/tests/twisted/jingle/test-wait-for-caps.py
index b967bde..cd59539 100644
--- a/tests/twisted/jingle/test-wait-for-caps.py
+++ b/tests/twisted/jingle/test-wait-for-caps.py
@@ -4,15 +4,11 @@ attempts to call a contact. Gabble should delay the RequestStreams
 call until caps have arrived.
 """
 
-from gabbletest import exec_test, make_result_iq, sync_stream
-from servicetest import make_channel_proxy, unwrap, tp_path_prefix, \
-        call_async, EventPattern, sync_dbus
-from twisted.words.xish import domish
+from gabbletest import exec_test
+from servicetest import make_channel_proxy, call_async, sync_dbus
 import jingletest
-import gabbletest
 
 import dbus
-import time
 
 import constants as cs
 import ns
-- 
1.5.6.5