diff options
author | William Deegan <bill@baddogconsulting.com> | 2017-03-20 01:15:23 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2017-03-20 01:15:23 (GMT) |
commit | 00d3efd103ce9bc00865517dac9b17275b3b8ab2 (patch) | |
tree | cc44655de017a1d721d46c02d27a1f94f94c0853 /test/SConscript | |
parent | 2c312564762cc54a119b74437566dc4aef4f7ca4 (diff) | |
download | SCons-00d3efd103ce9bc00865517dac9b17275b3b8ab2.zip SCons-00d3efd103ce9bc00865517dac9b17275b3b8ab2.tar.gz SCons-00d3efd103ce9bc00865517dac9b17275b3b8ab2.tar.bz2 |
py2/3 ab fix. Plus switch to must_match
Diffstat (limited to 'test/SConscript')
-rw-r--r-- | test/SConscript/SConscriptChdir.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/SConscript/SConscriptChdir.py b/test/SConscript/SConscriptChdir.py index 211d55b..2e25acf 100644 --- a/test/SConscript/SConscriptChdir.py +++ b/test/SConscript/SConscriptChdir.py @@ -69,17 +69,17 @@ exec(open(name, 'r').read()) for dir in ['dir1', 'dir2', 'dir3','dir4', 'dir5']: test.write([dir, 'create_test.py'], r""" -f = open("test.txt", "ab") +f = open("test.txt", "a") f.write("This is the %s test.\n") f.close() """ % dir) test.run(arguments=".", stderr=None) -test.fail_test(test.read(['dir1', 'test.txt']) != "This is the dir1 test.\n") -test.fail_test(test.read(['dir2', 'test.txt']) != "This is the dir2 test.\n") -test.fail_test(test.read('test.txt') != "This is the dir3 test.\nThis is the dir5 test.\n") -test.fail_test(test.read(['dir4', 'test.txt']) != "This is the dir4 test.\n") +test.must_match(['dir1', 'test.txt'],"This is the dir1 test.\n") +test.must_match(['dir2', 'test.txt'], "This is the dir2 test.\n") +test.must_match('test.txt',"This is the dir3 test.\nThis is the dir5 test.\n") +test.must_match(['dir4', 'test.txt'],"This is the dir4 test.\n") test.pass_test() |