[telepathy-gabble/master] correctly use assertEquals

[Guillaume Desmottes]

---
 tests/twisted/tubes/accept-muc-stream-tube.py     |   17 ++++++++---------
 tests/twisted/tubes/accept-private-stream-tube.py |   16 ++++++++--------
 tests/twisted/tubes/offer-muc-stream-tube.py      |    9 ++++-----
 tests/twisted/tubes/offer-private-stream-tube.py  |    8 ++++----
 4 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/tests/twisted/tubes/accept-muc-stream-tube.py b/tests/twisted/tubes/accept-muc-stream-tube.py
index aaa9410..fe10bb2 100644
--- a/tests/twisted/tubes/accept-muc-stream-tube.py
+++ b/tests/twisted/tubes/accept-muc-stream-tube.py
@@ -2,9 +2,8 @@
 
 import dbus
 
-from servicetest import call_async, EventPattern, EventProtocolClientFactory, unwrap
-from gabbletest import make_result_iq, acknowledge_iq, make_muc_presence, send_error_reply,\
-    assertEquals
+from servicetest import call_async, EventPattern, EventProtocolClientFactory, unwrap, assertEquals
+from gabbletest import make_result_iq, acknowledge_iq, make_muc_presence, send_error_reply
 import constants as cs
 import ns
 import tubetestutil as t
@@ -232,8 +231,8 @@ def test(q, bus, conn, stream, bytestream_cls,
     # peer closes the bytestream
     bytestream.close()
     e = q.expect('dbus-signal', signal='ConnectionClosed')
-    assertEquals(e.args[0], conn_id)
-    assertEquals(e.args[1], cs.CONNECTION_LOST)
+    assertEquals(conn_id, e.args[0])
+    assertEquals(cs.CONNECTION_LOST, e.args[1])
 
     # establish another tube connection
     socket_event, si_event, conn_id = t.connect_to_cm_socket(q, 'chat at conf.localhost/bob',
@@ -244,8 +243,8 @@ def test(q, bus, conn, stream, bytestream_cls,
     e, _ = q.expect_many(
         EventPattern('dbus-signal', signal='ConnectionClosed'),
         EventPattern('socket-disconnected'))
-    assertEquals(e.args[0], conn_id)
-    assertEquals(e.args[1], cs.CONNECTION_REFUSED)
+    assertEquals(conn_id, e.args[0])
+    assertEquals(cs.CONNECTION_REFUSED, e.args[1])
 
     # establish another tube connection
     socket_event, si_event, conn_id = t.connect_to_cm_socket(q, 'chat at conf.localhost/bob',
@@ -259,8 +258,8 @@ def test(q, bus, conn, stream, bytestream_cls,
     e, _ = q.expect_many(
         EventPattern('dbus-signal', signal='ConnectionClosed'),
         EventPattern('socket-disconnected'))
-    assertEquals(e.args[0], conn_id)
-    assertEquals(e.args[1], cs.CANCELLED)
+    assertEquals(conn_id, e.args[0])
+    assertEquals(cs.CANCELLED, e.args[1])
 
     # OK, we're done
     conn.Disconnect()
diff --git a/tests/twisted/tubes/accept-private-stream-tube.py b/tests/twisted/tubes/accept-private-stream-tube.py
index fe21db7..09a5c02 100644
--- a/tests/twisted/tubes/accept-private-stream-tube.py
+++ b/tests/twisted/tubes/accept-private-stream-tube.py
@@ -10,8 +10,8 @@ Receives several tube offers:
 
 import dbus
 
-from servicetest import call_async, EventPattern, sync_dbus
-from gabbletest import acknowledge_iq, send_error_reply, assertEquals
+from servicetest import call_async, EventPattern, sync_dbus, assertEquals
+from gabbletest import acknowledge_iq, send_error_reply
 
 from twisted.words.xish import domish, xpath
 from twisted.internet import reactor
@@ -236,8 +236,8 @@ def test(q, bus, conn, stream, bytestream_cls,
     e, _ = bytestream.wait_bytestream_closed([
         EventPattern('dbus-signal', signal='ConnectionClosed'),
         EventPattern('socket-disconnected')])
-    assertEquals(e.args[0], conn_id)
-    assertEquals(e.args[1], cs.CANCELLED)
+    assertEquals(conn_id, e.args[0])
+    assertEquals(cs.CANCELLED, e.args[1])
 
     # Receive a tube offer from Bob
     (tubes_chan, tubes_iface, new_tube_chan, new_tube_iface) = \
@@ -260,8 +260,8 @@ def test(q, bus, conn, stream, bytestream_cls,
     # peer closes the bytestream
     bytestream.close()
     e = q.expect('dbus-signal', signal='ConnectionClosed')
-    assertEquals(e.args[0], conn_id)
-    assertEquals(e.args[1], cs.CONNECTION_LOST)
+    assertEquals(conn_id, e.args[0])
+    assertEquals(cs.CONNECTION_LOST, e.args[1])
 
     # establish another tube connection
     event_socket, si_event, conn_id = t.connect_to_cm_socket(q, bob_jid,
@@ -270,8 +270,8 @@ def test(q, bus, conn, stream, bytestream_cls,
     # bytestream is refused
     send_error_reply(stream, si_event.stanza)
     e = q.expect('dbus-signal', signal='ConnectionClosed')
-    assertEquals(e.args[0], conn_id)
-    assertEquals(e.args[1], cs.CONNECTION_REFUSED)
+    assertEquals(conn_id, e.args[0])
+    assertEquals(cs.CONNECTION_REFUSED, e.args[1])
 
     tubes_chan.Close()
 
diff --git a/tests/twisted/tubes/offer-muc-stream-tube.py b/tests/twisted/tubes/offer-muc-stream-tube.py
index 600afb2..bc256de 100644
--- a/tests/twisted/tubes/offer-muc-stream-tube.py
+++ b/tests/twisted/tubes/offer-muc-stream-tube.py
@@ -5,9 +5,8 @@ import os
 
 import dbus
 
-from servicetest import call_async, EventPattern, unwrap,\
-    assertContains
-from gabbletest import acknowledge_iq, make_muc_presence, assertEquals
+from servicetest import call_async, EventPattern, unwrap, assertContains, assertEquals
+from gabbletest import acknowledge_iq, make_muc_presence
 import constants as cs
 import ns
 import tubetestutil as t
@@ -58,8 +57,8 @@ def use_tube(q, bytestream, protocol, conn_id):
     # peer closes the bytestream
     bytestream.close()
     e = q.expect('dbus-signal', signal='ConnectionClosed')
-    assertEquals(e.args[0], conn_id)
-    assertEquals(e.args[1], cs.CONNECTION_LOST)
+    assertEquals(conn_id, e.args[0])
+    assertEquals(cs.CONNECTION_LOST, e.args[1])
 
 def test(q, bus, conn, stream, bytestream_cls,
        address_type, access_control, access_control_param):
diff --git a/tests/twisted/tubes/offer-private-stream-tube.py b/tests/twisted/tubes/offer-private-stream-tube.py
index 75ebbb6..d3527ae 100644
--- a/tests/twisted/tubes/offer-private-stream-tube.py
+++ b/tests/twisted/tubes/offer-private-stream-tube.py
@@ -2,8 +2,8 @@
 
 import dbus
 
-from servicetest import call_async, EventPattern, sync_dbus
-from gabbletest import acknowledge_iq, sync_stream, assertEquals
+from servicetest import call_async, EventPattern, sync_dbus, assertEquals
+from gabbletest import acknowledge_iq, sync_stream
 import constants as cs
 import ns
 import tubetestutil as t
@@ -416,8 +416,8 @@ def test(q, bus, conn, stream, bytestream_cls,
     # peer closes the bytestream
     bytestream2.close()
     e = q.expect('dbus-signal', signal='ConnectionClosed')
-    assertEquals(e.args[0], conn_id)
-    assertEquals(e.args[1], cs.CONNECTION_LOST)
+    assertEquals(conn_id, e.args[0])
+    assertEquals(cs.CONNECTION_LOST, e.args[1])
 
     # OK, we're done
     conn.Disconnect()
-- 
1.5.6.5