summaryrefslogtreecommitdiff
path: root/test/builderrors.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-03-12 23:33:00 -0400
committerWilliam Deegan <bill@baddogconsulting.com>2017-03-12 23:33:00 -0400
commite54039fdd8675b7147293d5c1233e9c8982673a1 (patch)
tree6b6a57d75f4be82a5864af9fe11af51bd0769b7e /test/builderrors.py
parente9697930e73c81fcad8f937a99a3d4aab766a28e (diff)
downloadscons-e54039fdd8675b7147293d5c1233e9c8982673a1.tar.gz
py2/3 byte fixes
Diffstat (limited to 'test/builderrors.py')
-rw-r--r--test/builderrors.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/builderrors.py b/test/builderrors.py
index 88015f18..a3e2f4de 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', """