Changeset 10:3c5d9b2b69b8 in pyenvjasmine

Timestamp:

Apr 22, 2015, 1:12:54 PM (9 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Make tests compatible with python 3

File:

• pyenvjasmine/tests/test_runner.py (modified) (4 diffs)

pyenvjasmine/tests/test_runner.py

@@ -18 +18 @@
         jstests = TestRunner()
         output = jstests.run()
-        self.assertTrue('Failed: 0' in output)
-        self.assertTrue('Passed: 5' in output)
+        # output is the resulting stdout from a subprocess call, which is a
+        # bytes object, hence the b'' for the checks
+        self.assertTrue(b'Failed: 0' in output)
+        self.assertTrue(b'Passed: 5' in output)
 
     def test_runner_params(self):
@@ -36 +38 @@
         output = jstests.run(spec='tests/specs/test_demo.spec.js')
         lines = output.splitlines()
-        self.assertTrue(lines[0].endswith('specs/test_demo.spec.js'),
+        # output is the resulting stdout from a subprocess call, which is a
+        # bytes object, hence the b'' in the endswith/startswith calls
+        self.assertTrue(lines[0].endswith(b'specs/test_demo.spec.js'),
             "wrong output: %s" % str(output))
-        self.assertTrue(lines[1].startswith('[  Envjs/1.6 (Rhino;'),
+        self.assertTrue(lines[1].startswith(b'[  Envjs/1.6 (Rhino;'),
             "wrong output: %s" % str(output))
-        self.assertTrue('Passed: 4' in lines)
-        self.assertTrue('Failed: 0' in lines)
-        self.assertTrue('Total : 4' in lines)
+        self.assertTrue(b'Passed: 4' in lines)
+        self.assertTrue(b'Failed: 0' in lines)
+        self.assertTrue(b'Total : 4' in lines)
 
     def test_write_browser_htmlfile_markup_is_correct(self):
@@ -62 +66 @@
             actual = file.read()
             self.assertEqual(expected, actual)
-        
+
     def test_runner_with_browser_configfile(self):
         """
@@ -102 +106 @@
         """
         jstests = TestRunner()
-        print '--- output expected ---'
         output = jstests.run(capture_output=False)
-        print '--- end output expected ---'
         self.assertEqual(output, None)
-