From f15ec118c64276272432351fa54393ea5923888e Mon Sep 17 00:00:00 2001
From: Linus Heckemann <anonymouse2048@gmail.com>
Date: Tue, 1 Sep 2015 20:38:24 +0100
Subject: Fix tests for py3k

---
 test/lib/mock.py                      |  2 +-
 test/runtests.py                      | 11 ++++++-----
 test/unit/test_xmpp_transports_nb2.py |  5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'test')

diff --git a/test/lib/mock.py b/test/lib/mock.py
index fdaf000..e2a2b6c 100644
--- a/test/lib/mock.py
+++ b/test/lib/mock.py
@@ -212,7 +212,7 @@ class MockCall:
         elif isinstance(n, str):
             return self.kwparams[n]
         else:
-            raise IndexError, 'illegal index type for getParam'
+            raise IndexError('illegal index type for getParam')
 
     def getNumParams(self):
         return len(self.params)
diff --git a/test/runtests.py b/test/runtests.py
index 274a685..a8d03c2 100755
--- a/test/runtests.py
+++ b/test/runtests.py
@@ -6,6 +6,7 @@ Runs python-nbxmpp's Test Suite
 
 Unit tests tests will be run on each commit.
 '''
+from __future__ import print_function
 
 import sys
 import unittest
@@ -16,19 +17,19 @@ try:
     shortargs = 'hv:'
     longargs = 'help verbose='
     opts, args = getopt.getopt(sys.argv[1:], shortargs, longargs.split())
-except getopt.error, msg:
-    print msg
-    print 'for help use --help'
+except getopt.error as msg:
+    print(msg)
+    print('for help use --help')
     sys.exit(2)
 for o, a in opts:
     if o in ('-h', '--help'):
-        print 'runtests [--help] [--verbose level]'
+        print('runtests [--help] [--verbose level]')
         sys.exit()
     elif o in ('-v', '--verbose'):
         try:
             verbose = int(a)
         except Exception:
-            print 'verbose must be a number >= 0'
+            print('verbose must be a number >= 0')
             sys.exit(2)
 
 # new test modules need to be added manually
diff --git a/test/unit/test_xmpp_transports_nb2.py b/test/unit/test_xmpp_transports_nb2.py
index 269c975..ed09904 100644
--- a/test/unit/test_xmpp_transports_nb2.py
+++ b/test/unit/test_xmpp_transports_nb2.py
@@ -72,7 +72,7 @@ class TestNonBlockingTCP(AbstractTransportTest):
                 ips = socket.getaddrinfo('gajim.org', 5222,
                         socket.AF_UNSPEC, socket.SOCK_STREAM)
                 ip = ips[0]
-            except socket.error, e:
+            except socket.error as e:
                 self.testcase.fail(msg=str(e))
 
             self.socket = transports_nb.NonBlockingTCP(
@@ -175,7 +175,8 @@ class TestNonBlockingTCP(AbstractTransportTest):
         sock._do_send()
         sock._do_send()
         self.assertTrue(self.client.socket.state == 'CONNECTED')
-        self.assertTrue(data_part1 in outgoing and data_part2 in outgoing)
+        self.assertTrue(data_part1.encode('utf8') in outgoing)
+        self.assertTrue(data_part2.encode('utf8') in outgoing)
         self.assertFalse(sock.sendqueue and sock.sendbuff,
                 msg='There is still unsend data in buffers')
 
-- 
cgit v1.2.3