From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 18 May 2011 09:04:05 +0000 (+0100)
Subject: zero: Disable file test because of bug in file command.
X-Git-Tag: 1.10.3~17
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=bcb11e7a28527030f2eb6773d0b82e514ca765ce;p=libguestfs.git

zero: Disable file test because of bug in file command.

See: https://bugzilla.redhat.com/show_bug.cgi?id=705499
(cherry picked from commit f55b32b2db83495fc0987f0fe0e979818704dff1)
---

diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml
index 58c5f84..9408797 100644
--- a/generator/generator_actions.ml
+++ b/generator/generator_actions.ml
@@ -2965,10 +2965,9 @@ Checking or repairing NTFS volumes is not supported
 This command is entirely equivalent to running C<fsck -a -t fstype device>.");
 
   ("zero", (RErr, [Device "device"], []), 85, [Progress],
-   [InitBasicFS, Always, TestOutput (
+   [InitBasicFS, Always, TestRun (
       [["umount"; "/dev/sda1"];
-       ["zero"; "/dev/sda1"];
-       ["file"; "/dev/sda1"]], "data")],
+       ["zero"; "/dev/sda1"]])],
    "write zeroes to the device",
    "\
 This command writes zeroes over the first few blocks of C<device>.