Fix test-guestfish-a.sh regression test for new trace format.

[libguestfs.git] / regressions / rhbz576879.sh

diff --git a/regressions/rhbz576879.sh b/regressions/rhbz576879.sh
index 639dd7c..c9d7445 100755 (executable)
--- a/regressions/rhbz576879.sh
+++ b/regressions/rhbz576879.sh
@@ -24,10 +24,27 @@ set -e
 
 rm -f test1.img
 
-../fish/guestfish <<EOF
-alloc test1.img 10M
-run
+# Somewhere after 1.7, the first test started to hang.
+#
+# Somewhere between ~ 1.5.23 and ~ 1.5.24 the second test started
+# to hang.
+#
+# We don't understand why.  I have disabled this test and reopened
+# the upstream bug.
+# -- RWMJ 2010-12-06
+
+../fish/guestfish -N disk <<EOF
 -upload $srcdir/rhbz576879.sh /test.sh
 # Shouldn't lose synchronization, so next command should work:
 ping-daemon
-EOF
\ No newline at end of file
+EOF
+
+# Second patch tests the problem found in comment 5 where both ends
+# send cancel messages simultaneously.
+
+../fish/guestfish -N disk <<EOF
+-tar-in /tmp/nosuchfile /blah
+ping-daemon
+EOF
+
+rm -f test1.img
\ No newline at end of file