tests: str/bytes typo on run_python timeout

1 files changed, 6 insertions, 3 deletions

diff --git a/tests/__init__.py b/tests/__init__.py
index b9e0add..6ff6d2a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -306,8 +306,6 @@ def run_python(path, env=None, args=None, timeout=None):
     new_argv = [sys.executable]
     new_env = os.environ.copy()
     if path:
-        if not path.endswith('.py'):
-            path += '.py'
         path = os.path.abspath(path)
         new_argv.append(path)
         src_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -330,7 +328,7 @@ def run_python(path, env=None, args=None, timeout=None):
     except subprocess.TimeoutExpired:
         p.kill()
         output, _ = p.communicate(timeout=timeout)
-        return "{0}\nFAIL - timed out".format(output)
+        return '{0}\nFAIL - timed out'.format(output).encode()
     return output
 
 
@@ -350,3 +348,8 @@ def run_isolated(path, prefix='tests/isolated/', env=None, args=None, timeout=No
 
 certificate_file = os.path.join(os.path.dirname(__file__), 'test_server.crt')
 private_key_file = os.path.join(os.path.dirname(__file__), 'test_server.key')
+
+
+def test_run_python_timeout():
+    output = run_python('', args=('-c', 'import time; time.sleep(0.5)'), timeout=0.1)
+    assert output.endswith(b'FAIL - timed out')