[Telepathy-commits] [telepathy-salut/master] saluttest.py: import constants as cs

[Guillaume Desmottes]

---
 tests/twisted/saluttest.py |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/twisted/saluttest.py b/tests/twisted/saluttest.py
index 6ddbe9c..ee16bda 100644
--- a/tests/twisted/saluttest.py
+++ b/tests/twisted/saluttest.py
@@ -9,7 +9,7 @@ import time
 
 import servicetest
 from twisted.internet import reactor
-from constants import *
+import constants as cs
 from twisted.words.protocols.jabber.client import IQ
 
 import dbus
@@ -121,23 +121,23 @@ def wait_for_contact_list(q, conn):
     This is useful to avoid these signals to interfere with your test."""
 
     #FIXME: this maybe racy if there are other contacts connected
-    requestotron = dbus.Interface(conn, CONN_IFACE_REQUESTS)
+    requestotron = dbus.Interface(conn, cs.CONN_IFACE_REQUESTS)
 
     # publish
     requestotron.EnsureChannel({
-        CHANNEL_TYPE: CHANNEL_TYPE_CONTACT_LIST,
-        TARGET_HANDLE_TYPE: HT_CONTACT_LIST,
-        TARGET_ID: 'publish'})
+        cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_CONTACT_LIST,
+        cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT_LIST,
+        cs.TARGET_ID: 'publish'})
     q.expect('dbus-signal', signal='NewChannel')
     # subscribe
     requestotron.EnsureChannel({
-        CHANNEL_TYPE: CHANNEL_TYPE_CONTACT_LIST,
-        TARGET_HANDLE_TYPE: HT_CONTACT_LIST,
-        TARGET_ID: 'subscribe'})
+        cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_CONTACT_LIST,
+        cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT_LIST,
+        cs.TARGET_ID: 'subscribe'})
     q.expect('dbus-signal', signal='NewChannel')
     # known
     requestotron.EnsureChannel({
-        CHANNEL_TYPE: CHANNEL_TYPE_CONTACT_LIST,
-        TARGET_HANDLE_TYPE: HT_CONTACT_LIST,
-        TARGET_ID: 'known'})
+        cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_CONTACT_LIST,
+        cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT_LIST,
+        cs.TARGET_ID: 'known'})
     q.expect('dbus-signal', signal='NewChannel')
-- 
1.5.6.5