diff --git a/tests/apps/test.py b/tests/apps/test.py index 94bcf136..fd4797fd 100755 --- a/tests/apps/test.py +++ b/tests/apps/test.py @@ -37,6 +37,10 @@ import threading import multiprocessing.dummy as multiprocessing +from multiprocessing import cpu_count + + +assert sys.version_info.major >= 3 stdoutLock = threading.Lock() @@ -132,8 +136,11 @@ def test(args): stdout = stdout.read() stderr = stderr.read() - stdout = stdout.replace('\r\n', '\n') - stderr = stderr.replace('\r\n', '\n') + stdout = stdout.replace(b'\r\n', b'\n') + stderr = stderr.replace(b'\r\n', b'\n') + + stdout = stdout.decode() + stderr = stderr.decode() if options.verbose: with stdoutLock: @@ -243,7 +250,7 @@ def main(): failedTests = [] - numJobs = multiprocessing.cpu_count() + numJobs = cpu_count() pool = multiprocessing.Pool(numJobs) testSrcFiles = os.listdir(testsSrcDir)