diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-13 03:33:00 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-13 03:33:00 (GMT) |
| commit | 57f2bc39219ec1fdb609bb979294487512407963 (patch) | |
| tree | 6b6a57d75f4be82a5864af9fe11af51bd0769b7e /test/builderrors.py | |
| parent | 25335d29099874e0574a79d9a8644d66f1533838 (diff) | |
| download | SCons-57f2bc39219ec1fdb609bb979294487512407963.zip SCons-57f2bc39219ec1fdb609bb979294487512407963.tar.gz SCons-57f2bc39219ec1fdb609bb979294487512407963.tar.bz2 | |
py2/3 byte fixes
Diffstat (limited to 'test/builderrors.py')
| -rw-r--r-- | test/builderrors.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/builderrors.py b/test/builderrors.py index 88015f1..a3e2f4d 100644 --- a/test/builderrors.py +++ b/test/builderrors.py @@ -38,8 +38,8 @@ test.write('build.py', r""" import sys exitval = int(sys.argv[1]) if exitval == 0: - contents = open(sys.argv[3], 'rb').read() - file = open(sys.argv[2], 'wb') + contents = open(sys.argv[3], 'r').read() + file = open(sys.argv[2], 'w') file.write(contents) file.close() sys.exit(exitval) @@ -81,7 +81,7 @@ test.write(['two', 'f3.in'], "two/f3.in\n") test.run(chdir = 'two', arguments = "f1.out f2.out f3.out", stderr = "scons: *** [f2.out] Error 1\n", status = 2) -test.fail_test(test.read(['two', 'f1.out']) != "two/f1.in\n") +test.must_match(['two', 'f1.out'], "two/f1.in\n", mode='r') test.fail_test(os.path.exists(test.workpath('f2.out'))) test.fail_test(os.path.exists(test.workpath('f3.out'))) @@ -101,8 +101,8 @@ test.write(['three', 'f3.in'], "three/f3.in\n") test.run(chdir = 'three', arguments = "f1.out f2.out f3.out", stderr = "scons: *** [f3.out] Error 1\n", status = 2) -test.fail_test(test.read(['three', 'f1.out']) != "three/f1.in\n") -test.fail_test(test.read(['three', 'f2.out']) != "three/f2.in\n") +test.must_match(['three', 'f1.out'], "three/f1.in\n", mode='r') +test.must_match(['three', 'f2.out'], "three/f2.in\n", mode='r') test.fail_test(os.path.exists(test.workpath('f3.out'))) test.write('SConstruct', """ |