X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=regressions%2Ftest-cancellation-upload-daemoncancels.sh;h=179ea30a1a6835197575c84f94d891b5ea79b68f;hp=c56b1c2269fb6ceedbd6a6c7749734e749801436;hb=04ea1375c55aa67df4e7fc61dbb534111767f3b6;hpb=b5e29ac706004ad29da2e0949beda41e8e27e398

diff --git a/regressions/test-cancellation-upload-daemoncancels.sh b/regressions/test-cancellation-upload-daemoncancels.sh
index c56b1c2..179ea30 100755
--- a/regressions/test-cancellation-upload-daemoncancels.sh
+++ b/regressions/test-cancellation-upload-daemoncancels.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -
+#!/bin/bash -
 # libguestfs
 # Copyright (C) 2009 Red Hat Inc.
 #
@@ -14,7 +14,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # Test upload where the daemon cancels.
 #
@@ -22,22 +22,14 @@
 
 set -e
 
-rm -f test.img
-
-../fish/guestfish <<'EOF'
-alloc test.img 10M
-run
-
-sfdiskM /dev/sda ,
-mkfs ext2 /dev/sda1
-mount /dev/sda1 /
+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
 EOF
 
-rm -f test.img
+rm -f test1.img