[telepathy-gabble/master] remove unused imports in MUC tests
Dafydd Harries
daf at rhydd.org
Tue Mar 31 06:33:02 PDT 2009
---
tests/twisted/muc/name-conflict.py | 2 +-
tests/twisted/muc/renamed.py | 7 ++-----
tests/twisted/muc/roomlist.py | 6 ++----
tests/twisted/muc/send-error.py | 2 --
tests/twisted/muc/test-ensure.py | 8 ++------
tests/twisted/muc/test-muc-alias.py | 4 ----
tests/twisted/muc/test-muc-invitation.py | 2 +-
tests/twisted/muc/test-muc-ownership.py | 6 ++----
8 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/tests/twisted/muc/name-conflict.py b/tests/twisted/muc/name-conflict.py
index 43fce0f..c333222 100644
--- a/tests/twisted/muc/name-conflict.py
+++ b/tests/twisted/muc/name-conflict.py
@@ -10,7 +10,7 @@ from twisted.words.xish import domish
from gabbletest import (
exec_test, make_muc_presence, request_muc_handle, sync_stream
)
-from servicetest import call_async, EventPattern, unwrap, sync_dbus
+from servicetest import call_async, unwrap, sync_dbus
from constants import (
HT_CONTACT, HT_ROOM,
CONN_IFACE_REQUESTS, CHANNEL_TYPE_TEXT, CHANNEL_IFACE_GROUP,
diff --git a/tests/twisted/muc/renamed.py b/tests/twisted/muc/renamed.py
index 9657870..6f30664 100644
--- a/tests/twisted/muc/renamed.py
+++ b/tests/twisted/muc/renamed.py
@@ -4,18 +4,15 @@ Test dealing with the server giving you a nick you didn't ask for.
import dbus
-from twisted.words.xish import domish
-
from gabbletest import (
- exec_test, make_muc_presence, request_muc_handle, sync_stream
+ exec_test, make_muc_presence, request_muc_handle
)
-from servicetest import call_async, EventPattern, unwrap, sync_dbus
+from servicetest import call_async, unwrap
from constants import (
HT_CONTACT, HT_ROOM,
CONN_IFACE_REQUESTS, CHANNEL_TYPE_TEXT, CHANNEL_IFACE_GROUP,
CHANNEL_TYPE, TARGET_HANDLE_TYPE, TARGET_HANDLE,
)
-import ns
def test(q, bus, conn, stream):
conn.Connect()
diff --git a/tests/twisted/muc/roomlist.py b/tests/twisted/muc/roomlist.py
index b7234c8..ce0bdd4 100644
--- a/tests/twisted/muc/roomlist.py
+++ b/tests/twisted/muc/roomlist.py
@@ -5,10 +5,8 @@ Test MUC support.
import dbus
-from twisted.words.xish import domish
-
-from gabbletest import go, make_result_iq, exec_test, sync_stream
-from servicetest import call_async, lazy, match, EventPattern, \
+from gabbletest import make_result_iq, exec_test, sync_stream
+from servicetest import call_async, EventPattern, \
tp_name_prefix, tp_path_prefix
def test(q, bus, conn, stream):
diff --git a/tests/twisted/muc/send-error.py b/tests/twisted/muc/send-error.py
index e8314ab..87215f5 100644
--- a/tests/twisted/muc/send-error.py
+++ b/tests/twisted/muc/send-error.py
@@ -4,8 +4,6 @@ Test incoming error messages in MUC channels.
import dbus
-from twisted.words.xish import domish
-
from gabbletest import exec_test
from servicetest import EventPattern
import ns
diff --git a/tests/twisted/muc/test-ensure.py b/tests/twisted/muc/test-ensure.py
index 80d91d3..90ce9ce 100644
--- a/tests/twisted/muc/test-ensure.py
+++ b/tests/twisted/muc/test-ensure.py
@@ -3,12 +3,8 @@ Test that EnsureChannel works for MUCs, particularly in the case when there
are several pending requests for the same MUC.
"""
-import dbus
-
-from twisted.words.xish import domish
-
-from gabbletest import go, make_result_iq, exec_test, make_muc_presence
-from servicetest import call_async, lazy, match, EventPattern
+from gabbletest import make_result_iq, exec_test, make_muc_presence
+from servicetest import call_async, EventPattern
def test(q, bus, conn, stream):
conn.Connect()
diff --git a/tests/twisted/muc/test-muc-alias.py b/tests/twisted/muc/test-muc-alias.py
index 66bd94e..d6b19c6 100644
--- a/tests/twisted/muc/test-muc-alias.py
+++ b/tests/twisted/muc/test-muc-alias.py
@@ -2,10 +2,6 @@
Test that our alias is used to create MUC JIDs.
"""
-import dbus
-
-from twisted.words.xish import domish
-
from gabbletest import exec_test, make_muc_presence, request_muc_handle, \
expect_and_handle_get_vcard, expect_and_handle_set_vcard
from servicetest import call_async, EventPattern
diff --git a/tests/twisted/muc/test-muc-invitation.py b/tests/twisted/muc/test-muc-invitation.py
index 7fd5cf3..057d2de 100644
--- a/tests/twisted/muc/test-muc-invitation.py
+++ b/tests/twisted/muc/test-muc-invitation.py
@@ -6,7 +6,7 @@ import dbus
from twisted.words.xish import domish, xpath
-from gabbletest import go, make_result_iq, exec_test, make_muc_presence
+from gabbletest import exec_test, make_muc_presence
from servicetest import call_async, EventPattern
def test(q, bus, conn, stream):
diff --git a/tests/twisted/muc/test-muc-ownership.py b/tests/twisted/muc/test-muc-ownership.py
index 93d1f2e..753ccbd 100644
--- a/tests/twisted/muc/test-muc-ownership.py
+++ b/tests/twisted/muc/test-muc-ownership.py
@@ -9,10 +9,8 @@ when presence is received that includes the MUC JID's owner JID.
import dbus
-from twisted.words.xish import domish, xpath
-
-from gabbletest import go, make_result_iq, exec_test, make_muc_presence
-from servicetest import call_async, lazy, match, tp_name_prefix, EventPattern
+from gabbletest import make_result_iq, exec_test, make_muc_presence
+from servicetest import call_async, EventPattern
def test(q, bus, conn, stream):
conn.Connect()
--
1.5.6.5
More information about the telepathy-commits
mailing list