X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=regressions%2Ftest-guestfish-d.sh;h=b95f62da129b82bbd0c8fead55683e363504bb8c;hp=b97ad3d2d6b901a60a9785f508534c432bcc04c8;hb=f1041e912b72116d66274d2f15e50ce34a9531fd;hpb=ddda0f7bd00a37274dae38f4ce93955b8cfdf7d7

diff --git a/regressions/test-guestfish-d.sh b/regressions/test-guestfish-d.sh
index b97ad3d..b95f62d 100755
--- a/regressions/test-guestfish-d.sh
+++ b/regressions/test-guestfish-d.sh
@@ -20,11 +20,11 @@
 
 set -e
 
-rm -f test.img test.xml test.out
+rm -f test1.img test2.img test3.img test.xml test.out
 
 cwd="$(pwd)"
 
-truncate -s 10M test.img
+truncate -s 1M test1.img test2.img test3.img
 
 # Libvirt test XML, see libvirt.git/examples/xml/test/testnode.xml
 cat > test.xml <<EOF
@@ -38,15 +38,29 @@ cat > test.xml <<EOF
     <memory>524288</memory>
     <devices>
       <disk type="file">
-        <source file="$cwd/test.img"/>
+        <source file="$cwd/test1.img"/>
         <target dev="hda"/>
       </disk>
+      <disk type="file">
+        <driver name="qemu" type="raw"/>
+        <source file="$cwd/test2.img"/>
+        <target dev="hdb"/>
+      </disk>
+      <disk type="file">
+        <driver name="qemu" type="qcow2"/>
+        <source file="$cwd/test3.img"/>
+        <target dev="hdc"/>
+      </disk>
     </devices>
   </domain>
 </node>
 EOF
 
-guestfish -c "test://$cwd/test.xml" --ro -d guest -x </dev/null >test.out 2>&1
-grep -sq '^add_drive_ro.*test.img' test.out
+../fish/guestfish -c "test://$cwd/test.xml" --ro -d guest \
+  debug-drives </dev/null >test.out
+grep -sq "test1.img.*snapshot=on" test.out
+! grep -sq "test1.img.*format" test.out
+grep -sq "test2.img.*snapshot=on.*format=raw" test.out
+grep -sq "test3.img.*snapshot=on.*format=qcow2" test.out
 
-rm -f test.img test.xml test.out
+rm -f test1.img test2.img test3.img test.xml test.out