[telepathy-gabble/master] use constants.py in FT tests
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Mon Mar 30 04:46:15 PDT 2009
---
.../twisted/file-transfer/file_transfer_helper.py | 208 ++++++++------------
...eceive-file-and-close-socket-while-receiving.py | 6 +-
...ive-file-and-sender-disconnect-while-pending.py | 11 +-
...file-and-sender-disconnect-while-transfering.py | 8 +-
.../file-transfer/test-receive-file-decline.py | 8 +-
.../test-send-file-and-cancel-immediately.py | 8 +-
.../file-transfer/test-send-file-declined.py | 10 +-
.../test-send-file-provide-immediately.py | 12 +-
.../test-send-file-to-unknown-contact.py | 4 +-
.../test-send-file-wait-to-provide.py | 17 +-
10 files changed, 127 insertions(+), 165 deletions(-)
diff --git a/tests/twisted/file-transfer/file_transfer_helper.py b/tests/twisted/file-transfer/file_transfer_helper.py
index 0713491..f5088f4 100644
--- a/tests/twisted/file-transfer/file_transfer_helper.py
+++ b/tests/twisted/file-transfer/file_transfer_helper.py
@@ -12,42 +12,8 @@ from bytestream import create_from_si_offer, BytestreamIBBMsg, BytestreamS5B, By
from twisted.words.xish import domish, xpath
-from dbus import PROPERTIES_IFACE
-
-CONNECTION_INTERFACE_REQUESTS = 'org.freedesktop.Telepathy.Connection.Interface.Requests'
-CHANNEL_INTERFACE ='org.freedesktop.Telepathy.Channel'
-CHANNEL_TYPE_FILE_TRANSFER = 'org.freedesktop.Telepathy.Channel.Type.FileTransfer'
-HT_CONTACT = 1
-HT_CONTACT_LIST = 3
-
-FT_STATE_NONE = 0
-FT_STATE_PENDING = 1
-FT_STATE_ACCEPTED = 2
-FT_STATE_OPEN = 3
-FT_STATE_COMPLETED = 4
-FT_STATE_CANCELLED = 5
-
-FT_STATE_CHANGE_REASON_NONE = 0
-FT_STATE_CHANGE_REASON_REQUESTED = 1
-FT_STATE_CHANGE_REASON_LOCAL_STOPPED = 2
-FT_STATE_CHANGE_REASON_REMOTE_STOPPED = 3
-FT_STATE_CHANGE_REASON_LOCAL_ERROR = 4
-FT_STATE_CHANGE_REASON_REMOTE_ERROR = 5
-
-FILE_HASH_TYPE_NONE = 0
-FILE_HASH_TYPE_MD5 = 1
-FILE_HASH_TYPE_SHA1 = 2
-FILE_HASH_TYPE_SHA256 = 3
-
-SOCKET_ADDRESS_TYPE_UNIX = 0
-SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX = 1
-SOCKET_ADDRESS_TYPE_IPV4 = 2
-SOCKET_ADDRESS_TYPE_IPV6 = 3
-
-SOCKET_ACCESS_CONTROL_LOCALHOST = 0
-SOCKET_ACCESS_CONTROL_PORT = 1
-SOCKET_ACCESS_CONTROL_NETMASK = 2
-SOCKET_ACCESS_CONTROL_CREDENTIALS = 3
+import constants as cs
+
class File(object):
DEFAULT_DATA = "What a nice file"
@@ -57,7 +23,7 @@ class File(object):
def __init__(self, data=DEFAULT_DATA, name=DEFAULT_NAME,
content_type=DEFAULT_CONTENT_TYPE, description=DEFAULT_DESCRIPTION,
- hash_type=FILE_HASH_TYPE_MD5):
+ hash_type=cs.FILE_HASH_TYPE_MD5):
self.data = data
self.size = len(self.data)
self.name = name
@@ -69,7 +35,7 @@ class File(object):
self.compute_hash(hash_type)
def compute_hash(self, hash_type):
- assert hash_type == FILE_HASH_TYPE_MD5
+ assert hash_type == cs.FILE_HASH_TYPE_MD5
self.hash_type = hash_type
m = md5.new()
@@ -100,12 +66,12 @@ class FileTransferTest(object):
self.stream.send(roster)
self.self_handle = self.conn.GetSelfHandle()
- self.self_handle_name = self.conn.InspectHandles(HT_CONTACT, [self.self_handle])[0]
+ self.self_handle_name = self.conn.InspectHandles(cs.HT_CONTACT, [self.self_handle])[0]
def announce_contact(self, name=CONTACT_NAME):
self.contact_name = name
self.contact_full_jid = '%s/Telepathy' % name
- self.handle = self.conn.RequestHandles(HT_CONTACT, [name])[0]
+ self.handle = self.conn.RequestHandles(cs.HT_CONTACT, [name])[0]
presence = domish.Element(('jabber:client', 'presence'))
presence['from'] = self.contact_full_jid
@@ -136,9 +102,9 @@ class FileTransferTest(object):
def create_ft_channel(self):
ft_chan = self.bus.get_object(self.conn.object.bus_name, self.ft_path)
- self.channel = dbus.Interface(ft_chan, CHANNEL_INTERFACE)
- self.ft_channel = dbus.Interface(ft_chan, CHANNEL_TYPE_FILE_TRANSFER)
- self.ft_props = dbus.Interface(ft_chan, PROPERTIES_IFACE)
+ self.channel = dbus.Interface(ft_chan, cs.CHANNEL)
+ self.ft_channel = dbus.Interface(ft_chan, cs.CHANNEL_TYPE_FILE_TRANSFER)
+ self.ft_props = dbus.Interface(ft_chan, cs.PROPERTIES_IFACE)
def close_channel(self):
self.channel.Close()
@@ -193,43 +159,43 @@ class ReceiveFileTest(FileTransferTest):
# check channel properties
# org.freedesktop.Telepathy.Channel D-Bus properties
- assert props[CHANNEL_INTERFACE + '.ChannelType'] == CHANNEL_TYPE_FILE_TRANSFER
- assert props[CHANNEL_INTERFACE + '.Interfaces'] == []
- assert props[CHANNEL_INTERFACE + '.TargetHandle'] == self.handle
- assert props[CHANNEL_INTERFACE + '.TargetID'] == self.contact_name
- assert props[CHANNEL_INTERFACE + '.TargetHandleType'] == HT_CONTACT
- assert props[CHANNEL_INTERFACE + '.Requested'] == False
- assert props[CHANNEL_INTERFACE + '.InitiatorHandle'] == self.handle
- assert props[CHANNEL_INTERFACE + '.InitiatorID'] == self.contact_name
+ assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_FILE_TRANSFER
+ assert props[cs.INTERFACES] == []
+ assert props[cs.TARGET_HANDLE] == self.handle
+ assert props[cs.TARGET_ID] == self.contact_name
+ assert props[cs.TARGET_HANDLE_TYPE] == cs.HT_CONTACT
+ assert props[cs.REQUESTED] == False
+ assert props[cs.INITIATOR_HANDLE] == self.handle
+ assert props[cs.INITIATOR_ID] == self.contact_name
# org.freedesktop.Telepathy.Channel.Type.FileTransfer D-Bus properties
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.State'] == FT_STATE_PENDING
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.ContentType'] == self.file.content_type
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.Filename'] == self.file.name
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.Size'] == self.file.size
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.State'] == cs.FT_STATE_PENDING
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentType'] == self.file.content_type
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.Filename'] == self.file.name
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.Size'] == self.file.size
# FT's protocol doesn't allow us the send the hash info
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.ContentHashType'] == FILE_HASH_TYPE_MD5
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash'] == self.file.hash
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.Description'] == self.file.description
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.Date'] == self.file.date
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.AvailableSocketTypes'] == \
- {SOCKET_ADDRESS_TYPE_UNIX: [SOCKET_ACCESS_CONTROL_LOCALHOST]}
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.TransferredBytes'] == 0
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset'] == 0
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHashType'] == cs.FILE_HASH_TYPE_MD5
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash'] == self.file.hash
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.Description'] == self.file.description
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.Date'] == self.file.date
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.AvailableSocketTypes'] == \
+ {cs.SOCKET_ADDRESS_TYPE_UNIX: [cs.SOCKET_ACCESS_CONTROL_LOCALHOST]}
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.TransferredBytes'] == 0
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset'] == 0
self.ft_path = path
def accept_file(self):
- self.address = self.ft_channel.AcceptFile(SOCKET_ADDRESS_TYPE_UNIX,
- SOCKET_ACCESS_CONTROL_LOCALHOST, "", 0)
+ self.address = self.ft_channel.AcceptFile(cs.SOCKET_ADDRESS_TYPE_UNIX,
+ cs.SOCKET_ACCESS_CONTROL_LOCALHOST, "", 0)
state_event, iq_event = self.q.expect_many(
EventPattern('dbus-signal', signal='FileTransferStateChanged'),
EventPattern('stream-iq', iq_type='result'))
state, reason = state_event.args
- assert state == FT_STATE_ACCEPTED
- assert reason == FT_STATE_CHANGE_REASON_REQUESTED
+ assert state == cs.FT_STATE_ACCEPTED
+ assert reason == cs.FT_STATE_CHANGE_REASON_REQUESTED
# Got SI reply
self.bytestream.check_si_reply(iq_event.stanza)
@@ -245,8 +211,8 @@ class ReceiveFileTest(FileTransferTest):
assert offset == 0
state, reason = state_event.args
- assert state == FT_STATE_OPEN
- assert reason == FT_STATE_CHANGE_REASON_NONE
+ assert state == cs.FT_STATE_OPEN
+ assert reason == cs.FT_STATE_CHANGE_REASON_NONE
# send the beginning of the file (client didn't connect to socket yet)
self.bytestream.send_data(self.file.data[:2])
@@ -281,8 +247,8 @@ class ReceiveFileTest(FileTransferTest):
e = self.q.expect('dbus-signal', signal='FileTransferStateChanged')
state, reason = e.args
- assert state == FT_STATE_COMPLETED
- assert reason == FT_STATE_CHANGE_REASON_NONE
+ assert state == cs.FT_STATE_COMPLETED
+ assert reason == cs.FT_STATE_CHANGE_REASON_NONE
class SendFileTest(FileTransferTest):
def __init__(self, bytestream_cls):
@@ -294,64 +260,62 @@ class SendFileTest(FileTransferTest):
self.close_channel, self.done]
def check_ft_available(self):
- properties = self.conn.GetAll(
- CONNECTION_INTERFACE_REQUESTS,
- dbus_interface=PROPERTIES_IFACE)
-
- assert ({CHANNEL_INTERFACE + '.ChannelType': CHANNEL_TYPE_FILE_TRANSFER,
- CHANNEL_INTERFACE + '.TargetHandleType': HT_CONTACT},
- [CHANNEL_INTERFACE + '.TargetHandle',
- CHANNEL_INTERFACE + '.TargetID',
- CHANNEL_TYPE_FILE_TRANSFER + '.ContentType',
- CHANNEL_TYPE_FILE_TRANSFER + '.Filename',
- CHANNEL_TYPE_FILE_TRANSFER + '.Size',
- CHANNEL_TYPE_FILE_TRANSFER + '.ContentHashType',
- CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash',
- CHANNEL_TYPE_FILE_TRANSFER + '.Description',
- CHANNEL_TYPE_FILE_TRANSFER + '.Date']
+ properties = self.conn.GetAll(cs.CONN_IFACE_REQUESTS,
+ dbus_interface=cs.PROPERTIES_IFACE)
+
+ assert ({cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_FILE_TRANSFER,
+ cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT},
+ [cs.TARGET_HANDLE, cs.TARGET_ID,
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentType',
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.Filename',
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.Size',
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHashType',
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash',
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.Description',
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.Date']
) in properties.get('RequestableChannelClasses'),\
properties['RequestableChannelClasses']
def request_ft_channel(self):
- requests_iface = dbus.Interface(self.conn, CONNECTION_INTERFACE_REQUESTS)
+ requests_iface = dbus.Interface(self.conn, cs.CONN_IFACE_REQUESTS)
self.ft_path, props = requests_iface.CreateChannel({
- CHANNEL_INTERFACE + '.ChannelType': CHANNEL_TYPE_FILE_TRANSFER,
- CHANNEL_INTERFACE + '.TargetHandleType': HT_CONTACT,
- CHANNEL_INTERFACE + '.TargetHandle': self.handle,
- CHANNEL_TYPE_FILE_TRANSFER + '.ContentType': self.file.content_type,
- CHANNEL_TYPE_FILE_TRANSFER + '.Filename': self.file.name,
- CHANNEL_TYPE_FILE_TRANSFER + '.Size': self.file.size,
- CHANNEL_TYPE_FILE_TRANSFER + '.ContentHashType': self.file.hash_type,
- CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash': self.file.hash,
- CHANNEL_TYPE_FILE_TRANSFER + '.Description': self.file.description,
- CHANNEL_TYPE_FILE_TRANSFER + '.Date': self.file.date,
- CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset': 0,
+ cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_FILE_TRANSFER,
+ cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+ cs.TARGET_HANDLE: self.handle,
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentType': self.file.content_type,
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.Filename': self.file.name,
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.Size': self.file.size,
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHashType': self.file.hash_type,
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash': self.file.hash,
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.Description': self.file.description,
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.Date': self.file.date,
+ cs.CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset': 0,
})
# org.freedesktop.Telepathy.Channel D-Bus properties
- assert props[CHANNEL_INTERFACE + '.ChannelType'] == CHANNEL_TYPE_FILE_TRANSFER
- assert props[CHANNEL_INTERFACE + '.Interfaces'] == []
- assert props[CHANNEL_INTERFACE + '.TargetHandle'] == self.handle
- assert props[CHANNEL_INTERFACE + '.TargetID'] == self.contact_name
- assert props[CHANNEL_INTERFACE + '.TargetHandleType'] == HT_CONTACT
- assert props[CHANNEL_INTERFACE + '.Requested'] == True
- assert props[CHANNEL_INTERFACE + '.InitiatorHandle'] == self.self_handle
- assert props[CHANNEL_INTERFACE + '.InitiatorID'] == self.self_handle_name
+ assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_FILE_TRANSFER
+ assert props[cs.INTERFACES] == []
+ assert props[cs.TARGET_HANDLE] == self.handle
+ assert props[cs.TARGET_ID] == self.contact_name
+ assert props[cs.TARGET_HANDLE_TYPE] == cs.HT_CONTACT
+ assert props[cs.REQUESTED] == True
+ assert props[cs.INITIATOR_HANDLE] == self.self_handle
+ assert props[cs.INITIATOR_ID] == self.self_handle_name
# org.freedesktop.Telepathy.Channel.Type.FileTransfer D-Bus properties
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.State'] == FT_STATE_PENDING
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.ContentType'] == self.file.content_type
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.Filename'] == self.file.name
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.Size'] == self.file.size
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.ContentHashType'] == self.file.hash_type
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash'] == self.file.hash
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.Description'] == self.file.description
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.Date'] == self.file.date
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.AvailableSocketTypes'] == \
- {SOCKET_ADDRESS_TYPE_UNIX: [SOCKET_ACCESS_CONTROL_LOCALHOST]}
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.TransferredBytes'] == 0
- assert props[CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset'] == 0
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.State'] == cs.FT_STATE_PENDING
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentType'] == self.file.content_type
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.Filename'] == self.file.name
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.Size'] == self.file.size
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHashType'] == self.file.hash_type
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash'] == self.file.hash
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.Description'] == self.file.description
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.Date'] == self.file.date
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.AvailableSocketTypes'] == \
+ {cs.SOCKET_ADDRESS_TYPE_UNIX: [cs.SOCKET_ACCESS_CONTROL_LOCALHOST]}
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.TransferredBytes'] == 0
+ assert props[cs.CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset'] == 0
def got_send_iq(self):
iq_event = self.q.expect('stream-iq', to=self.contact_full_jid)
@@ -380,8 +344,8 @@ class SendFileTest(FileTransferTest):
assert self.desc == self.file.description
def provide_file(self):
- self.address = self.ft_channel.ProvideFile(SOCKET_ADDRESS_TYPE_UNIX,
- SOCKET_ACCESS_CONTROL_LOCALHOST, "")
+ self.address = self.ft_channel.ProvideFile(cs.SOCKET_ADDRESS_TYPE_UNIX,
+ cs.SOCKET_ACCESS_CONTROL_LOCALHOST, "")
def client_accept_file(self):
# accept SI offer
@@ -422,8 +386,8 @@ class SendFileTest(FileTransferTest):
self.bytestream.wait_bytestream_closed()
state, reason = e.args
- assert state == FT_STATE_COMPLETED
- assert reason == FT_STATE_CHANGE_REASON_NONE
+ assert state == cs.FT_STATE_COMPLETED
+ assert reason == cs.FT_STATE_CHANGE_REASON_NONE
def exec_file_transfer_test(test_cls):
for bytestream_cls in [BytestreamIBBMsg, BytestreamS5B, BytestreamS5BPidgin, BytestreamSIFallbackS5CannotConnect,
diff --git a/tests/twisted/file-transfer/test-receive-file-and-close-socket-while-receiving.py b/tests/twisted/file-transfer/test-receive-file-and-close-socket-while-receiving.py
index 1685e1e..0ec3a86 100644
--- a/tests/twisted/file-transfer/test-receive-file-and-close-socket-while-receiving.py
+++ b/tests/twisted/file-transfer/test-receive-file-and-close-socket-while-receiving.py
@@ -1,7 +1,7 @@
import socket
-from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest,\
- FT_STATE_CANCELLED, FT_STATE_CHANGE_REASON_LOCAL_ERROR
+import constants as cs
+from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest
class ReceiveFileAndCancelWhileReceiving(ReceiveFileTest):
def receive_file(self):
@@ -16,7 +16,7 @@ class ReceiveFileAndCancelWhileReceiving(ReceiveFileTest):
self.bytestream.send_data(self.file.data[2:3])
self.q.expect('dbus-signal', signal='FileTransferStateChanged',
- args=[FT_STATE_CANCELLED, FT_STATE_CHANGE_REASON_LOCAL_ERROR])
+ args=[cs.FT_STATE_CANCELLED, cs.FT_STATE_CHANGE_REASON_LOCAL_ERROR])
self.channel.Close()
self.q.expect('dbus-signal', signal='Closed')
diff --git a/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-pending.py b/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-pending.py
index bf0ec0f..ec678ef 100644
--- a/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-pending.py
+++ b/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-pending.py
@@ -3,8 +3,7 @@ import dbus
from twisted.words.xish import domish
import constants as cs
-from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest, SOCKET_ADDRESS_TYPE_UNIX,\
- SOCKET_ACCESS_CONTROL_LOCALHOST, FT_STATE_CANCELLED, FT_STATE_CHANGE_REASON_REMOTE_STOPPED
+from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest
class ReceiveFileAndSenderDisconnectWhilePendingTest(ReceiveFileTest):
def accept_file(self):
@@ -17,13 +16,13 @@ class ReceiveFileAndSenderDisconnectWhilePendingTest(ReceiveFileTest):
e = self.q.expect('dbus-signal', signal='FileTransferStateChanged')
state, reason = e.args
- assert state == FT_STATE_CANCELLED
- assert reason == FT_STATE_CHANGE_REASON_REMOTE_STOPPED
+ assert state == cs.FT_STATE_CANCELLED
+ assert reason == cs.FT_STATE_CHANGE_REASON_REMOTE_STOPPED
# We can't accept the transfer now
try:
- self.ft_channel.AcceptFile(SOCKET_ADDRESS_TYPE_UNIX,
- SOCKET_ACCESS_CONTROL_LOCALHOST, "", 0)
+ self.ft_channel.AcceptFile(cs.SOCKET_ADDRESS_TYPE_UNIX,
+ cs.SOCKET_ACCESS_CONTROL_LOCALHOST, "", 0)
except dbus.DBusException, e:
assert e.get_dbus_name() == cs.NOT_AVAILABLE
else:
diff --git a/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-transfering.py b/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-transfering.py
index ae15200..12f7f64 100644
--- a/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-transfering.py
+++ b/tests/twisted/file-transfer/test-receive-file-and-sender-disconnect-while-transfering.py
@@ -1,7 +1,7 @@
from twisted.words.xish import domish
-from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest,\
- FT_STATE_CANCELLED, FT_STATE_CHANGE_REASON_REMOTE_STOPPED
+import constants as cs
+from file_transfer_helper import exec_file_transfer_test, ReceiveFileTest
class ReceiveFileAndSenderDisconnectWhileTransfering(ReceiveFileTest):
def accept_file(self):
@@ -15,8 +15,8 @@ class ReceiveFileAndSenderDisconnectWhileTransfering(ReceiveFileTest):
e = self.q.expect('dbus-signal', signal='FileTransferStateChanged')
state, reason = e.args
- assert state == FT_STATE_CANCELLED
- assert reason == FT_STATE_CHANGE_REASON_REMOTE_STOPPED
+ assert state == cs.FT_STATE_CANCELLED
+ assert reason == cs.FT_STATE_CHANGE_REASON_REMOTE_STOPPED
return True
diff --git a/tests/twisted/file-transfer/test-receive-file-decline.py b/tests/twisted/file-transfer/test-receive-file-decline.py
index 97c4f31..b7422e0 100644
--- a/tests/twisted/file-transfer/test-receive-file-decline.py
+++ b/tests/twisted/file-transfer/test-receive-file-decline.py
@@ -1,8 +1,8 @@
from servicetest import EventPattern
from twisted.words.xish import xpath
-from file_transfer_helper import ReceiveFileTest, FT_STATE_CANCELLED, \
- FT_STATE_CHANGE_REASON_LOCAL_STOPPED, exec_file_transfer_test
+import constants as cs
+from file_transfer_helper import ReceiveFileTest, exec_file_transfer_test
class ReceiveFileDeclineTest(ReceiveFileTest):
def accept_file(self):
@@ -17,8 +17,8 @@ class ReceiveFileDeclineTest(ReceiveFileTest):
assert error_node['code'] == '403'
state, reason = state_event.args
- assert state == FT_STATE_CANCELLED
- assert reason == FT_STATE_CHANGE_REASON_LOCAL_STOPPED
+ assert state == cs.FT_STATE_CANCELLED
+ assert reason == cs.FT_STATE_CHANGE_REASON_LOCAL_STOPPED
self.q.expect('dbus-signal', signal='Closed')
# stop test
diff --git a/tests/twisted/file-transfer/test-send-file-and-cancel-immediately.py b/tests/twisted/file-transfer/test-send-file-and-cancel-immediately.py
index dd7e623..ac5c42f 100644
--- a/tests/twisted/file-transfer/test-send-file-and-cancel-immediately.py
+++ b/tests/twisted/file-transfer/test-send-file-and-cancel-immediately.py
@@ -1,5 +1,5 @@
-from file_transfer_helper import SendFileTest, FT_STATE_CANCELLED, \
- FT_STATE_CHANGE_REASON_LOCAL_STOPPED, exec_file_transfer_test
+import constants as cs
+from file_transfer_helper import SendFileTest, exec_file_transfer_test
class SendFileAndCancelImmediatelyTest(SendFileTest):
def provide_file(self):
@@ -10,8 +10,8 @@ class SendFileAndCancelImmediatelyTest(SendFileTest):
e = self.q.expect('dbus-signal', signal='FileTransferStateChanged')
state, reason = e.args
- assert state == FT_STATE_CANCELLED
- assert reason == FT_STATE_CHANGE_REASON_LOCAL_STOPPED
+ assert state == cs.FT_STATE_CANCELLED
+ assert reason == cs.FT_STATE_CHANGE_REASON_LOCAL_STOPPED
self.q.expect('dbus-signal', signal='Closed')
diff --git a/tests/twisted/file-transfer/test-send-file-declined.py b/tests/twisted/file-transfer/test-send-file-declined.py
index 4a74a81..a3a4949 100644
--- a/tests/twisted/file-transfer/test-send-file-declined.py
+++ b/tests/twisted/file-transfer/test-send-file-declined.py
@@ -1,5 +1,5 @@
-from file_transfer_helper import SendFileTest, FT_STATE_CANCELLED, \
- FT_STATE_CHANGE_REASON_REMOTE_STOPPED, CHANNEL_TYPE_FILE_TRANSFER, exec_file_transfer_test
+import constants as cs
+from file_transfer_helper import SendFileTest, exec_file_transfer_test
from twisted.words.xish import domish
import ns
@@ -23,10 +23,10 @@ class SendFileDeclinedTest(SendFileTest):
e = self.q.expect('dbus-signal', signal='FileTransferStateChanged')
state, reason = e.args
- assert state == FT_STATE_CANCELLED, state
- assert reason == FT_STATE_CHANGE_REASON_REMOTE_STOPPED
+ assert state == cs.FT_STATE_CANCELLED, state
+ assert reason == cs.FT_STATE_CHANGE_REASON_REMOTE_STOPPED
- transferred = self.ft_props.Get(CHANNEL_TYPE_FILE_TRANSFER, 'TransferredBytes')
+ transferred = self.ft_props.Get(cs.CHANNEL_TYPE_FILE_TRANSFER, 'TransferredBytes')
# no byte has been transferred as the file was declined
assert transferred == 0
diff --git a/tests/twisted/file-transfer/test-send-file-provide-immediately.py b/tests/twisted/file-transfer/test-send-file-provide-immediately.py
index bb66917..16f089e 100644
--- a/tests/twisted/file-transfer/test-send-file-provide-immediately.py
+++ b/tests/twisted/file-transfer/test-send-file-provide-immediately.py
@@ -1,13 +1,13 @@
-from file_transfer_helper import SendFileTest, CHANNEL_TYPE_FILE_TRANSFER, FT_STATE_PENDING, \
- FT_STATE_CHANGE_REASON_NONE, FT_STATE_OPEN, exec_file_transfer_test
+import constants as cs
+from file_transfer_helper import SendFileTest, exec_file_transfer_test
class SendFileTransferProvideImmediately(SendFileTest):
def provide_file(self):
SendFileTest.provide_file(self)
# state is still Pending as remote didn't accept the transfer yet
- state = self.ft_props.Get(CHANNEL_TYPE_FILE_TRANSFER, 'State')
- assert state == FT_STATE_PENDING
+ state = self.ft_props.Get(cs.CHANNEL_TYPE_FILE_TRANSFER, 'State')
+ assert state == cs.FT_STATE_PENDING
def client_accept_file(self):
SendFileTest.client_accept_file(self)
@@ -20,8 +20,8 @@ class SendFileTransferProvideImmediately(SendFileTest):
# Channel is open. We can start to send the file
e = self.q.expect('dbus-signal', signal='FileTransferStateChanged')
state, reason = e.args
- assert state == FT_STATE_OPEN
- assert reason == FT_STATE_CHANGE_REASON_NONE
+ assert state == cs.FT_STATE_OPEN
+ assert reason == cs.FT_STATE_CHANGE_REASON_NONE
if __name__ == '__main__':
exec_file_transfer_test(SendFileTransferProvideImmediately)
diff --git a/tests/twisted/file-transfer/test-send-file-to-unknown-contact.py b/tests/twisted/file-transfer/test-send-file-to-unknown-contact.py
index 5fcafb9..37da7b5 100644
--- a/tests/twisted/file-transfer/test-send-file-to-unknown-contact.py
+++ b/tests/twisted/file-transfer/test-send-file-to-unknown-contact.py
@@ -1,7 +1,7 @@
import dbus
import constants as cs
-from file_transfer_helper import SendFileTest, HT_CONTACT, exec_file_transfer_test
+from file_transfer_helper import SendFileTest, exec_file_transfer_test
class SendFileTransferToUnknownContactTest(SendFileTest):
def __init__(self, bytestream_cls):
@@ -11,7 +11,7 @@ class SendFileTransferToUnknownContactTest(SendFileTest):
def my_request_ft_channel(self):
self.contact_name = 'jean at localhost'
- self.handle = self.conn.RequestHandles(HT_CONTACT, [self.contact_name])[0]
+ self.handle = self.conn.RequestHandles(cs.HT_CONTACT, [self.contact_name])[0]
try:
self.request_ft_channel()
diff --git a/tests/twisted/file-transfer/test-send-file-wait-to-provide.py b/tests/twisted/file-transfer/test-send-file-wait-to-provide.py
index 3930249..d46dc04 100644
--- a/tests/twisted/file-transfer/test-send-file-wait-to-provide.py
+++ b/tests/twisted/file-transfer/test-send-file-wait-to-provide.py
@@ -1,6 +1,5 @@
-from file_transfer_helper import SendFileTest, CHANNEL_TYPE_FILE_TRANSFER, \
- FT_STATE_PENDING, FT_STATE_ACCEPTED, FT_STATE_OPEN, FT_STATE_CHANGE_REASON_REQUESTED, \
- FT_STATE_CHANGE_REASON_NONE, exec_file_transfer_test
+import constants as cs
+from file_transfer_helper import SendFileTest, exec_file_transfer_test
class SendFileTransferWaitToProvideTest(SendFileTest):
def __init__(self, bytestream_cls):
@@ -12,16 +11,16 @@ class SendFileTransferWaitToProvideTest(SendFileTest):
def client_accept_file(self):
# state is still Pending as remote didn't accept the transfer yet
- state = self.ft_props.Get(CHANNEL_TYPE_FILE_TRANSFER, 'State')
- assert state == FT_STATE_PENDING
+ state = self.ft_props.Get(cs.CHANNEL_TYPE_FILE_TRANSFER, 'State')
+ assert state == cs.FT_STATE_PENDING
SendFileTest.client_accept_file(self)
# Remote accepted the transfer
e = self.q.expect('dbus-signal', signal='FileTransferStateChanged')
state, reason = e.args
- assert state == FT_STATE_ACCEPTED, state
- assert reason == FT_STATE_CHANGE_REASON_NONE
+ assert state == cs.FT_STATE_ACCEPTED, state
+ assert reason == cs.FT_STATE_CHANGE_REASON_NONE
def provide_file(self):
SendFileTest.provide_file(self)
@@ -34,8 +33,8 @@ class SendFileTransferWaitToProvideTest(SendFileTest):
# Channel is open. We can start to send the file
e = self.q.expect('dbus-signal', signal='FileTransferStateChanged')
state, reason = e.args
- assert state == FT_STATE_OPEN
- assert reason == FT_STATE_CHANGE_REASON_REQUESTED
+ assert state == cs.FT_STATE_OPEN
+ assert reason == cs.FT_STATE_CHANGE_REASON_REQUESTED
if __name__ == '__main__':
exec_file_transfer_test(SendFileTransferWaitToProvideTest)
--
1.5.6.5
More information about the telepathy-commits
mailing list