Made tests Python 3 compliant

Author: MarcCote

smartdispatch/tests/test_smartdispatch.py

@@ -3,11 +3,7 @@
 import shutil
 import time as t
 from os.path import join as pjoin
-
-try:
-    from io import StringIO  # Python 3
-except ImportError:
-    from StringIO import StringIO  # Python 2
+from io import StringIO, open
 
 import tempfile
 from nose.tools import assert_true, assert_equal
@@ -47,11 +43,11 @@ def test_get_commands_from_file():
     commands = ["command1 arg1 arg2",
                 "command2",
                 "command3 arg1 arg2 arg3 arg4"]
-    fileobj = StringIO("\n".join(commands))
+    fileobj = StringIO(u"\n".join(commands))
     assert_array_equal(smartdispatch.get_commands_from_file(fileobj), commands)
 
     # Test stripping last line if empty
-    fileobj = StringIO("\n".join(commands) + "\n")
+    fileobj = StringIO(u"\n".join(commands) + u"\n")
     assert_array_equal(smartdispatch.get_commands_from_file(fileobj), commands)
 
 

smartdispatch/tests/test_utils.py

@@ -75,7 +75,7 @@ def test_open_with_lock():
 
     stdout, stderr = process.communicate()
     assert_equal(stdout, b"")
-    assert_true("write-lock" in stderr, msg="Forcing a race condition, try increasing sleeping time above.")
-    assert_true("Traceback" not in stderr, msg="Unexpected error: " + stderr)  # Check that there are no errors.
+    assert_true("write-lock" in stderr.decode(), msg="Forcing a race condition, try increasing sleeping time above.")
+    assert_true("Traceback" not in stderr.decode(), msg="Unexpected error: " + stderr.decode())  # Check that there are no errors.
 
     shutil.rmtree(temp_dir)

tests/test_smart_worker.py

@@ -22,7 +22,7 @@ def setUp(self):
         self.command_manager = CommandManager(os.path.join(self._commands_dir, "commands.txt"))
         self.command_manager.set_commands_to_run(self.commands)
 
-        self.commands_uid = map(utils.generate_uid_from_string, self.commands)
+        self.commands_uid = list(map(utils.generate_uid_from_string, self.commands))
 
     def tearDown(self):
         shutil.rmtree(self._commands_dir)
@@ -111,6 +111,6 @@ def test_lock(self):
             time.sleep(1)
 
         stdout, stderr = process.communicate()
-        assert_equal(stdout, "")
-        assert_true("write-lock" in stderr, msg="Forcing a race condition, try increasing sleeping time above.")
-        assert_true("Traceback" not in stderr)  # Check that there are no errors.
+        assert_equal(stdout, b"")
+        assert_true("write-lock" in stderr.decode(), msg="Forcing a race condition, try increasing sleeping time above.")
+        assert_true("Traceback" not in stderr.decode())  # Check that there are no errors.