Changeset 30:d5fde7cc2958 in pyenvjasmine

Timestamp:

Jan 18, 2018, 12:57:09 PM (6 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Make some python3 compatibility changes (bytes/unicode/str mess)

Location:

pyenvjasmine

Files:

• runner.py (modified) (1 diff)
• tests/test_runner.py (modified) (2 diffs)

pyenvjasmine/runner.py

@@ -72 +72 @@
 
     while True:
-        output = p.stdout.readline(1)
-        if output == '' and p.poll() is not None:
+        output = p.stdout.readline(1).decode('utf-8')
+        if output in ['', b''] and p.poll() is not None:
             break
         if output == '\n':

pyenvjasmine/tests/test_runner.py

@@ -14 +14 @@
         success, stdout = jstests.run()
         assert success
-        # output is the resulting stdout from a subprocess call, which is a
-        # bytes object, hence the b'' for the checks
-        assert b'Failed: 0' in stdout
-        assert b'Passed: 5' in stdout
+        assert 'Failed: 0' in stdout
+        assert 'Passed: 5' in stdout
 
     def test_runner_params(self):
@@ -34 +32 @@
         success, stdout = jstests.run(spec='tests/specs/test_demo.spec.js')
         lines = stdout.splitlines()
-        # output is the resulting stdout from a subprocess call, which is a
-        # bytes object, hence the b'' in the endswith/startswith calls
-        assert lines[0].endswith(b'specs/test_demo.spec.js')
-        assert lines[1].startswith(b'[  Envjs/1.6 (Rhino;')
-        assert b'Passed: 4' in lines
-        assert b'Failed: 0' in lines
-        assert b'Total : 4' in lines
+        assert lines[0].endswith('specs/test_demo.spec.js')
+        assert lines[1].startswith('[  Envjs/1.6 (Rhino;')
+        assert 'Passed: 4' in lines
+        assert 'Failed: 0' in lines
+        assert 'Total : 4' in lines
 
     def test_write_browser_htmlfile_markup_is_correct(self):