summaryrefslogtreecommitdiffstats
path: root/test/builderrors.py
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2019-03-31 13:01:00 (GMT)
committerMats Wichmann <mats@linux.com>2019-04-25 15:37:04 (GMT)
commitf61d3bcd112285644c1a6ce253b267ef690a7e06 (patch)
tree2e489e238c11697f602cb9a7cbeb43afed088734 /test/builderrors.py
parentb0c3385604ebc1d7d552472f1cc6d0910aafa32a (diff)
downloadSCons-f61d3bcd112285644c1a6ce253b267ef690a7e06.zip
SCons-f61d3bcd112285644c1a6ce253b267ef690a7e06.tar.gz
SCons-f61d3bcd112285644c1a6ce253b267ef690a7e06.tar.bz2
[PY 3.8] test fixes for file closings, rawstrings
On a linux host (missing some things that may be on the Travis CI setup), Py3.8a3 now shows 19 fails, 1048 pass, with 84 Warning: messages. Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/builderrors.py')
-rw-r--r--test/builderrors.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/test/builderrors.py b/test/builderrors.py
index a3e2f4d..f5cbccf 100644
--- a/test/builderrors.py
+++ b/test/builderrors.py
@@ -38,10 +38,8 @@ test.write('build.py', r"""
import sys
exitval = int(sys.argv[1])
if exitval == 0:
- contents = open(sys.argv[3], 'r').read()
- file = open(sys.argv[2], 'w')
- file.write(contents)
- file.close()
+ with open(sys.argv[2], 'w') as f, open(sys.argv[3], 'r') as infp:
+ f.write(infp.read())
sys.exit(exitval)
""")
@@ -198,8 +196,8 @@ env = Environment()
env.Default("all")
env.Alias("all", env.Install("dir", "file.txt"))
""")
-test.run(status=2, match=TestSCons.match_re, stderr="""\
-scons: \*\*\* Do not know how to make File target `all' \(.*all\). Stop.
+test.run(status=2, match=TestSCons.match_re, stderr=\
+r"""scons: \*\*\* Do not know how to make File target `all' \(.*all\). Stop.
""")
# No tests failed; OK.