diff options
| author | Mats Wichmann <mats@linux.com> | 2019-04-25 19:44:24 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-04-25 19:44:24 (GMT) |
| commit | 0e84c296d686e4384c8e6f5137a7c15e51dcb167 (patch) | |
| tree | c4e043cd046190eaa7d2d6a72a5f87cc85aa23cf /test | |
| parent | f3c5ac37a96adc91d688d17a9ad462a95d32587c (diff) | |
| download | SCons-0e84c296d686e4384c8e6f5137a7c15e51dcb167.zip SCons-0e84c296d686e4384c8e6f5137a7c15e51dcb167.tar.gz SCons-0e84c296d686e4384c8e6f5137a7c15e51dcb167.tar.bz2 | |
[PR #3345] fix a few more Py3.8 problems
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/QT/qt_warnings.py | 4 | ||||
| -rw-r--r-- | test/packaging/rpm/package.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/QT/qt_warnings.py b/test/QT/qt_warnings.py index 23612de..020333e 100644 --- a/test/QT/qt_warnings.py +++ b/test/QT/qt_warnings.py @@ -84,8 +84,8 @@ if moc: qtdir = os.path.dirname(os.path.dirname(moc)) qtdir = qtdir.replace('\\', '\\\\' ) - expect = \ -r"""scons: warning: Could not detect qt, using moc executable as a hint \(QTDIR=%s\) + expect = r""" +scons: warning: Could not detect qt, using moc executable as a hint \(QTDIR=%s\) File "%s", line \d+, in (\?|<module>) """ % (qtdir, re.escape(SConstruct_path)) else: diff --git a/test/packaging/rpm/package.py b/test/packaging/rpm/package.py index ddd3c89..23ebe05 100644 --- a/test/packaging/rpm/package.py +++ b/test/packaging/rpm/package.py @@ -86,7 +86,7 @@ test.must_not_exist( 'bin/main' ) with os.popen('rpm -qpl %s' % machine_rpm) as p: out = p.read() test.must_contain_all_lines(out, '/bin/main') -with os.popen('rpm -qpl %s' % machine_rpm) as p: +with os.popen('rpm -qpl %s' % src_rpm) as p: out = p.read() test.fail_test( not out == 'foo-1.2.3.spec\nfoo-1.2.3.tar.gz\n') |