[Telepathy-commits] [telepathy-gabble/master] Twisted tests: rename dbus_sync to sync_dbus

[Alban Crequy]

20080528161034-a41c0-97cd17e3c6e3cdd814c5f12f544447e1ae7f428a.gz
---
 tests/twisted/servicetest.py    |    2 +-
 tests/twisted/test-caps-hash.py |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py
index 4dcdf69..cbc8f79 100644
--- a/tests/twisted/servicetest.py
+++ b/tests/twisted/servicetest.py
@@ -363,7 +363,7 @@ def call_async(test, proxy, method, *args, **kw):
     kw.update({'reply_handler': reply_func, 'error_handler': error_func})
     method_proxy(*args, **kw)
 
-def dbus_sync(bus, q, conn):
+def sync_dbus(bus, q, conn):
     # Dummy D-Bus method call
     call_async(q, conn, "InspectHandles", 1, [])
 
diff --git a/tests/twisted/test-caps-hash.py b/tests/twisted/test-caps-hash.py
index 0b098bc..0b52746 100644
--- a/tests/twisted/test-caps-hash.py
+++ b/tests/twisted/test-caps-hash.py
@@ -26,7 +26,7 @@ import sys
 from twisted.words.xish import domish, xpath
 
 from gabbletest import exec_test, make_result_iq
-from servicetest import dbus_sync
+from servicetest import sync_dbus
 
 gabble_service = 'org.freedesktop.Telepathy.ConnectionManager.gabble'
 text = 'org.freedesktop.Telepathy.Channel.Type.Text'
@@ -128,7 +128,7 @@ def test_hash(q, bus, conn, stream, contact, contact_handle, client):
     stream.send(result)
 
     # don't receive any D-Bus signal
-    dbus_sync(bus, q, conn)
+    sync_dbus(bus, q, conn)
     assert caps_changed_flag == False
 
     # send presence with empty caps
@@ -144,7 +144,7 @@ def test_hash(q, bus, conn, stream, contact, contact_handle, client):
         client + '#' + '0.0'
 
     # still don't receive any D-Bus signal
-    dbus_sync(bus, q, conn)
+    sync_dbus(bus, q, conn)
     assert caps_changed_flag == False
 
     # send good reply
@@ -173,7 +173,7 @@ def test_hash(q, bus, conn, stream, contact, contact_handle, client):
         client + '#' + c['ver']
 
     # don't receive any D-Bus signal
-    dbus_sync(bus, q, conn)
+    sync_dbus(bus, q, conn)
     assert caps_changed_flag == False
 
     # send good reply
@@ -254,7 +254,7 @@ def test_two_clients(q, bus, conn, stream, contact1, contact2,
         client + '#' + ver
 
     # don't receive any D-Bus signal
-    dbus_sync(bus, q, conn)
+    sync_dbus(bus, q, conn)
     assert caps_changed_flag == False
 
     # send good reply
@@ -282,7 +282,7 @@ def test_two_clients(q, bus, conn, stream, contact1, contact2,
             client + '#' + ver
 
         # don't receive any D-Bus signal
-        dbus_sync(bus, q, conn)
+        sync_dbus(bus, q, conn)
         assert caps_changed_flag == False
 
         # send good reply
@@ -308,7 +308,7 @@ def test_two_clients(q, bus, conn, stream, contact1, contact2,
     caps_changed_flag = False
 
     # don't receive any D-Bus signal
-    dbus_sync(bus, q, conn)
+    sync_dbus(bus, q, conn)
     assert caps_changed_flag == False
 
 def test(q, bus, conn, stream):
-- 
1.5.6.3