summaryrefslogtreecommitdiffstats
path: root/test/FindFile.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/FindFile.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/FindFile.py')
-rw-r--r--test/FindFile.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/test/FindFile.py b/test/FindFile.py
index e878172..fa195c4 100644
--- a/test/FindFile.py
+++ b/test/FindFile.py
@@ -40,13 +40,17 @@ test.write(['bar', 'baz', 'testfile2'], 'test 4\n')
test.write('SConstruct', """
env = Environment(FILE = 'file', BAR = 'bar')
file1 = FindFile('testfile1', [ 'foo', '.', 'bar', 'bar/baz' ])
-print(open(str(file1), 'r').read())
+with open(str(file1), 'r') as f:
+ print(f.read())
file2 = env.FindFile('test${FILE}1', [ 'bar', 'foo', '.', 'bar/baz' ])
-print(open(str(file2), 'r').read())
+with open(str(file2), 'r') as f:
+ print(f.read())
file3 = FindFile('testfile2', [ 'foo', '.', 'bar', 'bar/baz' ])
-print(open(str(file3), 'r').read())
+with open(str(file3), 'r') as f:
+ print(f.read())
file4 = env.FindFile('testfile2', [ '$BAR/baz', 'foo', '.', 'bar' ])
-print(open(str(file4), 'r').read())
+with open(str(file4), 'r') as f:
+ print(f.read())
""")
expect = test.wrap_stdout(read_str = """test 1