| commit | 2c78857bf6a9b5d06e17533b8f40fee14e087987 | |
| author | Max Reitz <mreitz@redhat.com> | |
| Tue, 10 Sep 2013 11:59:43 +0000 (10 13:59 +0200) | ||
| committer | Kevin Wolf <kwolf@redhat.com> | |
| Thu, 12 Sep 2013 08:12:48 +0000 (12 10:12 +0200) | ||
| tree | 3e8a770c66835ecdd42924566d338b96d692f6b9 | treesnapshot (tar.gz zip) |
| parent | 3ef6c40ad0b350e18c78135ffbdbe209cb479c1f | commitdiff |
qemu-iotests: Adjustments due to error propagation
When opening/creating images, propagating errors instead of immediately
emitting them on occurrence results in errors generally being printed on
a single line rather than being split up into multiple ones. This in
turn requires adjustments to some test results.
Also, test 060 used a sed to filter out the test image directory and
format by removing everything from the affected line after a certain
keyword; this now also removes the error message itself, which can be
fixed by using _filter_testdir and _filter_imgfmt.
Finally, _make_test_img in common.rc did not filter out the test image
directory etc. from stderr. This has been fixed through a redirection of
stderr to stdout (which is already done in _check_test_img and
_img_info).
Signed-off-by: Max Reitz <mreitz@redhat.com>
When opening/creating images, propagating errors instead of immediately
emitting them on occurrence results in errors generally being printed on
a single line rather than being split up into multiple ones. This in
turn requires adjustments to some test results.
Also, test 060 used a sed to filter out the test image directory and
format by removing everything from the affected line after a certain
keyword; this now also removes the error message itself, which can be
fixed by using _filter_testdir and _filter_imgfmt.
Finally, _make_test_img in common.rc did not filter out the test image
directory etc. from stderr. This has been fixed through a redirection of
stderr to stdout (which is already done in _check_test_img and
_img_info).
Signed-off-by: Max Reitz <mreitz@redhat.com>