[Telepathy-commits] [telepathy-salut/master] check if offset is always 0 when the ft is open

[Guillaume Desmottes]

---
 tests/twisted/avahi/test-receive-file.py |    9 ++++++++-
 tests/twisted/avahi/test-send-file.py    |    8 ++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/tests/twisted/avahi/test-receive-file.py b/tests/twisted/avahi/test-receive-file.py
index 2392b89..14275ba 100644
--- a/tests/twisted/avahi/test-receive-file.py
+++ b/tests/twisted/avahi/test-receive-file.py
@@ -15,6 +15,8 @@ from servicetest import make_channel_proxy, EventPattern
 
 from twisted.words.xish import domish
 
+from dbus import PROPERTIES_IFACE
+
 tp_name_prefix = 'org.freedesktop.Telepathy'
 ft_name_prefix = '%s.Channel.Type.FileTransfer.DRAFT' % tp_name_prefix
 
@@ -150,8 +152,9 @@ def test(q, bus, conn):
 
     channel = make_channel_proxy(conn, path, 'Channel')
     ft_channel = make_channel_proxy(conn, path, 'Channel.Type.FileTransfer.DRAFT')
+    ft_props = dbus.Interface(bus.get_object(conn.object.bus_name, path), PROPERTIES_IFACE)
 
-    address = ft_channel.AcceptFile(SOCKET_ADDRESS_TYPE_UNIX, SOCKET_ACCESS_CONTROL_LOCALHOST, "", 0)
+    address = ft_channel.AcceptFile(SOCKET_ADDRESS_TYPE_UNIX, SOCKET_ACCESS_CONTROL_LOCALHOST, "", 5)
 
     e = q.expect('dbus-signal', signal='FileTransferStateChanged')
     state, reason = e.args
@@ -164,6 +167,10 @@ def test(q, bus, conn):
     assert state == FT_STATE_OPEN
     assert reason == FT_STATE_CHANGE_REASON_NONE
 
+    offset = ft_props.Get(CHANNEL_TYPE_FILE_TRANSFER, 'InitialOffset')
+    # We don't support resume
+    assert offset == 0
+
     # Connect to Salut's socket
     s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
     s.connect(address)
diff --git a/tests/twisted/avahi/test-send-file.py b/tests/twisted/avahi/test-send-file.py
index 2492439..83a644f 100644
--- a/tests/twisted/avahi/test-send-file.py
+++ b/tests/twisted/avahi/test-send-file.py
@@ -13,6 +13,8 @@ from servicetest import make_channel_proxy, EventPattern
 
 from twisted.words.xish import domish, xpath
 
+from dbus import PROPERTIES_IFACE
+
 tp_name_prefix = 'org.freedesktop.Telepathy'
 ft_name_prefix = '%s.Channel.Type.FileTransfer.DRAFT' % tp_name_prefix
 
@@ -139,6 +141,8 @@ def test(q, bus, conn):
 
     channel = make_channel_proxy(conn, path, 'Channel')
     ft_channel = make_channel_proxy(conn, path, 'Channel.Type.FileTransfer.DRAFT')
+    ft_props = dbus.Interface(bus.get_object(conn.object.bus_name, path), PROPERTIES_IFACE)
+
     address = ft_channel.OfferFile(SOCKET_ADDRESS_TYPE_UNIX, SOCKET_ACCESS_CONTROL_LOCALHOST, "")
 
     conn_event, state_event, iq_event = q.expect_many(
@@ -186,6 +190,10 @@ def test(q, bus, conn):
     assert state == FT_STATE_OPEN
     assert reason == FT_STATE_CHANGE_REASON_NONE
 
+    offset = ft_props.Get(CHANNEL_TYPE_FILE_TRANSFER, 'InitialOffset')
+    # We don't support resume
+    assert offset == 0
+
     s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
     s.connect(address)
     s.send(FILE_DATA)
-- 
1.5.6.5