[Telepathy-commits] [telepathy-gabble/master] tubes/accept-private-stream-tube.py: import constants as cs

[Guillaume Desmottes]

---
 tests/twisted/tubes/accept-private-stream-tube.py |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/twisted/tubes/accept-private-stream-tube.py b/tests/twisted/tubes/accept-private-stream-tube.py
index d7abd8e..afde3eb 100644
--- a/tests/twisted/tubes/accept-private-stream-tube.py
+++ b/tests/twisted/tubes/accept-private-stream-tube.py
@@ -16,7 +16,7 @@ from gabbletest import acknowledge_iq
 from twisted.words.xish import domish, xpath
 from twisted.internet import reactor
 import ns
-from constants import *
+import constants as cs
 from bytestream import parse_si_offer
 import tubetestutil as t
 
@@ -38,8 +38,8 @@ def receive_tube_offer(q, bus, conn, stream):
         EventPattern('dbus-signal', signal='NewChannels'),
         )
     chan_path = old_sig.args[0]
-    assert old_sig.args[1] == CHANNEL_TYPE_TUBES, old_sig.args[1]
-    assert old_sig.args[2] == HT_CONTACT
+    assert old_sig.args[1] == cs.CHANNEL_TYPE_TUBES, old_sig.args[1]
+    assert old_sig.args[2] == cs.HT_CONTACT
     bob_handle = old_sig.args[3]
     assert old_sig.args[2] == 1, old_sig.args[2] # Suppress_Handler
     assert len(new_sig.args) == 1
@@ -55,8 +55,8 @@ def receive_tube_offer(q, bus, conn, stream):
         )
     new_chan_path = old_sig.args[0]
     assert new_chan_path != chan_path
-    assert old_sig.args[1] == CHANNEL_TYPE_STREAM_TUBE, old_sig.args[1]
-    assert old_sig.args[2] == HT_CONTACT
+    assert old_sig.args[1] == cs.CHANNEL_TYPE_STREAM_TUBE, old_sig.args[1]
+    assert old_sig.args[2] == cs.HT_CONTACT
     bob_handle = old_sig.args[3]
     assert old_sig.args[2] == 1, old_sig.args[2] # Suppress_Handler
     assert len(new_sig.args) == 1
@@ -66,10 +66,10 @@ def receive_tube_offer(q, bus, conn, stream):
 
     # create channel proxies
     tubes_chan = bus.get_object(conn.bus_name, chan_path)
-    tubes_iface = dbus.Interface(tubes_chan, CHANNEL_TYPE_TUBES)
+    tubes_iface = dbus.Interface(tubes_chan, cs.CHANNEL_TYPE_TUBES)
 
     new_tube_chan = bus.get_object(conn.bus_name, new_chan_path)
-    new_tube_iface = dbus.Interface(new_tube_chan, CHANNEL_TYPE_STREAM_TUBE)
+    new_tube_iface = dbus.Interface(new_tube_chan, cs.CHANNEL_TYPE_STREAM_TUBE)
 
     return (tubes_chan, tubes_iface, new_tube_chan, new_tube_iface)
 
-- 
1.5.6.5