[Telepathy-commits] [telepathy-gabble/master] test-caps-tubes.py: import constants as cs
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Tue Mar 24 05:14:01 PDT 2009
---
tests/twisted/test-caps-tubes.py | 94 +++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/tests/twisted/test-caps-tubes.py b/tests/twisted/test-caps-tubes.py
index 9120dd6..a8a43ca 100644
--- a/tests/twisted/test-caps-tubes.py
+++ b/tests/twisted/test-caps-tubes.py
@@ -36,7 +36,7 @@ import dbus
from twisted.words.xish import xpath
from gabbletest import exec_test, make_result_iq, sync_stream, make_presence
-from constants import *
+import constants as cs
from caps_helper import compute_caps_hash, text_fixed_properties,\
text_allowed_properties, stream_tube_fixed_properties, stream_tube_allowed_properties,\
@@ -44,36 +44,36 @@ from caps_helper import compute_caps_hash, text_fixed_properties,\
caps_contain
import ns
-specialized_tube_allowed_properties = dbus.Array([TARGET_HANDLE,
- TARGET_ID])
+specialized_tube_allowed_properties = dbus.Array([cs.TARGET_HANDLE,
+ cs.TARGET_ID])
daap_fixed_properties = dbus.Dictionary({
- TARGET_HANDLE_TYPE: HT_CONTACT,
- CHANNEL_TYPE: CHANNEL_TYPE_STREAM_TUBE,
- STREAM_TUBE_SERVICE: 'daap'
+ cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+ cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_STREAM_TUBE,
+ cs.STREAM_TUBE_SERVICE: 'daap'
})
http_fixed_properties = dbus.Dictionary({
- TARGET_HANDLE_TYPE: HT_CONTACT,
- CHANNEL_TYPE: CHANNEL_TYPE_STREAM_TUBE,
- STREAM_TUBE_SERVICE: 'http'
+ cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+ cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_STREAM_TUBE,
+ cs.STREAM_TUBE_SERVICE: 'http'
})
xiangqi_fixed_properties = dbus.Dictionary({
- TARGET_HANDLE_TYPE: HT_CONTACT,
- CHANNEL_TYPE: CHANNEL_TYPE_DBUS_TUBE,
- DBUS_TUBE_SERVICE_NAME: 'com.example.Xiangqi'
+ cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+ cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_DBUS_TUBE,
+ cs.DBUS_TUBE_SERVICE_NAME: 'com.example.Xiangqi'
})
go_fixed_properties = dbus.Dictionary({
- TARGET_HANDLE_TYPE: HT_CONTACT,
- CHANNEL_TYPE: CHANNEL_TYPE_DBUS_TUBE,
- DBUS_TUBE_SERVICE_NAME: 'com.example.Go'
+ cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+ cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_DBUS_TUBE,
+ cs.DBUS_TUBE_SERVICE_NAME: 'com.example.Go'
})
def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, client):
- conn_caps_iface = dbus.Interface(conn, CONN_IFACE_CONTACT_CAPA)
- conn_contacts_iface = dbus.Interface(conn, CONN_IFACE_CONTACTS)
+ conn_caps_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACT_CAPA)
+ conn_contacts_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACTS)
# send presence with no tube cap
presence = make_presence(contact, status='hello')
@@ -108,8 +108,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == basic_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -151,8 +151,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == generic_tubes_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -196,8 +196,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == daap_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -240,8 +240,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -288,8 +288,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == daap_xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -343,8 +343,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == all_tubes_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -377,8 +377,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == daap_xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -412,16 +412,16 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
(xiangqi_fixed_properties, specialized_tube_allowed_properties),
(go_fixed_properties, specialized_tube_allowed_properties)]})
- conn_caps_iface = dbus.Interface(conn, CONN_IFACE_CONTACT_CAPA)
- conn_contacts_iface = dbus.Interface(conn, CONN_IFACE_CONTACTS)
+ conn_caps_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACT_CAPA)
+ conn_contacts_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACTS)
# Check our own caps
caps = conn_caps_iface.GetContactCapabilities([1])
assert caps == basic_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [CONN_IFACE_CONTACT_CAPA], False) \
- [1][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise nothing
@@ -433,8 +433,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == basic_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [CONN_IFACE_CONTACT_CAPA], False) \
- [1][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
sync_stream(q, stream)
@@ -459,8 +459,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == daap_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [CONN_IFACE_CONTACT_CAPA], False) \
- [1][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise xiangqi
@@ -483,8 +483,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [CONN_IFACE_CONTACT_CAPA], False) \
- [1][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise daap + xiangqi
@@ -507,8 +507,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == daap_xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [CONN_IFACE_CONTACT_CAPA], False) \
- [1][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise 4 tubes
@@ -532,8 +532,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == all_tubes_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [CONN_IFACE_CONTACT_CAPA], False) \
- [1][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise daap + xiangqi
@@ -556,8 +556,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == daap_xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [CONN_IFACE_CONTACT_CAPA], False) \
- [1][CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
--
1.5.6.5
More information about the telepathy-commits
mailing list