diff options
author | William Deegan <bill@baddogconsulting.com> | 2017-05-16 23:03:50 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2017-05-16 23:03:50 (GMT) |
commit | e285a44855ef6685471ac24b78bdb28b683ce09f (patch) | |
tree | 1dc875dd5e8571c1f474259f7293dab0a2237d0c /test/Progress/TARGET.py | |
parent | 28365579c3ee73310c8ea1beac21caf4cbfc959d (diff) | |
download | SCons-e285a44855ef6685471ac24b78bdb28b683ce09f.zip SCons-e285a44855ef6685471ac24b78bdb28b683ce09f.tar.gz SCons-e285a44855ef6685471ac24b78bdb28b683ce09f.tar.bz2 |
py2/3 fix progress test failure due to trying to replace a byte array. Moved conversion to just prior to test.run()
Diffstat (limited to 'test/Progress/TARGET.py')
-rw-r--r-- | test/Progress/TARGET.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/Progress/TARGET.py b/test/Progress/TARGET.py index 9af5565..b2693e7 100644 --- a/test/Progress/TARGET.py +++ b/test/Progress/TARGET.py @@ -50,16 +50,18 @@ test.write('S2.in', "S2.in\n") test.write('S3.in', "S3.in\n") test.write('S4.in', "S4.in\n") -expect = bytearray("""\ +expect = """\ S1.in\r \rS1.out\rCopy("S1.out", "S1.in") \rS2.in\r \rS2.out\rCopy("S2.out", "S2.in") \rS3.in\r \rS3.out\rCopy("S3.out", "S3.in") \rS4.in\r \rS4.out\rCopy("S4.out", "S4.in") - \rSConstruct\r \r.\r""",'utf-8') + \rSConstruct\r \r.\r""" if os.linesep != '\n': expect = expect.replace('\n', os.linesep) +expect = bytearray(expect, 'utf-8') + test.run(arguments = '-Q .', stdout=expect) test.pass_test() |