regressions: Don't print misleading 'Expect error ...' lines.

Some tests in the regressions directory deliberately print
error messages.  As long as they still PASS, this is OK.

However these tests also printed some misleading messages
about what error to expect.  Since error messages were slightly
different across distros, these messages were not accurate.

Therefore remove these messages, and replace with a general
message before all tests telling users not to worry about
errors from the tests as long as the tests don't fail.

Cherry picked from commit e7ee6eebed
and rebased for stable branch.
This commit is contained in:
Richard Jones
2010-07-22 16:49:06 +01:00
parent 3f29445be9
commit 85bb71b5d5
7 changed files with 27 additions and 5 deletions

View File

@@ -24,6 +24,7 @@
include $(top_srcdir)/subdir-rules.mk
TESTS = \
tell-user-to-ignore-errors.sh \
rhbz503169c10.sh \
rhbz503169c13.sh \
rhbz557655.sh \

View File

@@ -0,0 +1,26 @@
#!/bin/bash -
# libguestfs
# Copyright (C) 2010 Red Hat Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
echo
echo '*****'
echo
echo 'Some of these tests print error messages. You can ignore'
echo 'these error messages as long as the tests print "PASS".'
echo
echo '*****'
echo

View File

@@ -31,7 +31,6 @@ run
mount-ro /dev/sda /
# Download a file to /dev/full.
echo "Expect: write: /dev/full: No space left on device"
-download /100krandom /dev/full
ping-daemon

View File

@@ -34,7 +34,6 @@ mount-options "" /dev/sda1 /
# Upload image, daemon should cancel because the image is too large
# to upload into itself.
echo "Expect: write: /test: No space left on device"
-upload test.img /test
ping-daemon

View File

@@ -30,7 +30,6 @@ run
kill-subprocess
# XXX The following sleep should NOT be necessary.
echo "Expect an error from the next command"
-sleep 1
# We should now be able to rerun the subprocess.

View File

@@ -30,7 +30,6 @@ run
pid | cat > test.pid
! sleep 2 ; kill $(cat test.pid) &
echo "Expect: 'guestfs_sleep reply failed, see earlier error messages'"
-sleep 1000
# We should now be able to rerun the subprocess.

View File

@@ -31,7 +31,6 @@ pid | cat > test.pid
! kill $(cat test.pid) ; sleep 2
# XXX The following sleep should NOT be necessary.
echo "Expect an error from the next command"
-sleep 1
# We should now be able to rerun the subprocess.