From: Richard Jones <rjones@redhat.com>
Date: Thu, 22 Jul 2010 15:49:06 +0000 (+0100)
Subject: regressions: Don't print misleading 'Expect error ...' lines.
X-Git-Tag: 1.4.2~5
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=6022a26cf6f09f313b77f564324a589602173672;p=libguestfs.git

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 e7ee6eebed6ee3a5b56c0482ba2770e697d8febc)
---

diff --git a/regressions/Makefile.am b/regressions/Makefile.am
index 385de45..41f5183 100644
--- a/regressions/Makefile.am
+++ b/regressions/Makefile.am
@@ -24,6 +24,7 @@
 include $(top_srcdir)/subdir-rules.mk
 
 TESTS = \
+	tell-user-to-ignore-errors.sh \
 	rhbz501893 \
 	rhbz503169c10.sh \
 	rhbz503169c13.sh \
diff --git a/regressions/tell-user-to-ignore-errors.sh b/regressions/tell-user-to-ignore-errors.sh
new file mode 100755
index 0000000..b17bf75
--- /dev/null
+++ b/regressions/tell-user-to-ignore-errors.sh
@@ -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
diff --git a/regressions/test-cancellation-download-librarycancels.sh b/regressions/test-cancellation-download-librarycancels.sh
index 7b59b7e..20f89d2 100755
--- a/regressions/test-cancellation-download-librarycancels.sh
+++ b/regressions/test-cancellation-download-librarycancels.sh
@@ -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
diff --git a/regressions/test-cancellation-upload-daemoncancels.sh b/regressions/test-cancellation-upload-daemoncancels.sh
index 8204530..605d70f 100755
--- a/regressions/test-cancellation-upload-daemoncancels.sh
+++ b/regressions/test-cancellation-upload-daemoncancels.sh
@@ -27,7 +27,6 @@ rm -f test1.img
 ../fish/guestfish -N fs -m /dev/sda1 <<'EOF'
 # 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
diff --git a/regressions/test-qemudie-killsub.sh b/regressions/test-qemudie-killsub.sh
index 3280975..9f78953 100755
--- a/regressions/test-qemudie-killsub.sh
+++ b/regressions/test-qemudie-killsub.sh
@@ -27,7 +27,6 @@ rm -f test1.img
 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.
diff --git a/regressions/test-qemudie-midcommand.sh b/regressions/test-qemudie-midcommand.sh
index 84e19b0..47cad04 100755
--- a/regressions/test-qemudie-midcommand.sh
+++ b/regressions/test-qemudie-midcommand.sh
@@ -27,7 +27,6 @@ rm -f test.pid test1.img
 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.
diff --git a/regressions/test-qemudie-synch.sh b/regressions/test-qemudie-synch.sh
index 85aef69..fcc2e50 100755
--- a/regressions/test-qemudie-synch.sh
+++ b/regressions/test-qemudie-synch.sh
@@ -28,7 +28,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.