diff options
author | Steven Knight <knight@baldmt.com> | 2010-05-27 22:04:24 +0000 |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2010-05-27 22:04:24 +0000 |
commit | 4df37343ec8b20c1426fd77761e77c6b06c20965 (patch) | |
tree | f9422c46d0346aa65609255c58b53e47b01e0e7d /test/GetBuildFailures | |
parent | 3d2c8ddaa2214fe8113fad94a5d4cc25dae93d67 (diff) | |
download | scons-4df37343ec8b20c1426fd77761e77c6b06c20965.tar.gz |
Update QMTEst/Test{Cmd,Common}.py to version 1.1 from upstream:
* incorporate and update the Python 3.0 fixer work by Greg:
* full conversion to using subprocess for execution;
* rename exactly_contain_all_lines() to must_contain_exactly_lines();
* other minor fixes and stylistic cleanups.
Diffstat (limited to 'test/GetBuildFailures')
-rw-r--r-- | test/GetBuildFailures/option-k.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/GetBuildFailures/option-k.py b/test/GetBuildFailures/option-k.py index 142fbf45..b4e8d54c 100644 --- a/test/GetBuildFailures/option-k.py +++ b/test/GetBuildFailures/option-k.py @@ -91,8 +91,8 @@ scons: *** [f5] Error 1 """ test.run(arguments = '-k .', status = 2, stdout=None, stderr=None) -test.exactly_contain_all_lines(test.stdout(), expect_stdout, title='stdout') -test.exactly_contain_all_lines(test.stderr(), expect_stderr, title='stderr') +test.must_contain_exactly_lines(test.stdout(), expect_stdout, title='stdout') +test.must_contain_exactly_lines(test.stderr(), expect_stderr, title='stderr') test.must_match(test.workpath('f3'), 'f3.in\n') test.must_not_exist(test.workpath('f4')) |