From: Matthew Booth <mbooth@redhat.com>
Date: Wed, 5 Aug 2009 22:33:22 +0000 (+0100)
Subject: Fix test failures in upload and download (RHBZ#515764)
X-Git-Tag: 1.0.66~13
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=b1e3c305f8e604a527c2f6b5a8f61cfebeec2b41;p=libguestfs.git

Fix test failures in upload and download (RHBZ#515764)

The tests hardcoded an MD5 of the test file, COPYING.LIB, whose contents had
change. This change causes it to compute the MD5 rather than hardcoding it.

OCaml provided by rjones.
---

diff --git a/src/generator.ml b/src/generator.ml
index 94dc268..7ac4ac8 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -1756,7 +1756,8 @@ This uses the L<blockdev(8)> command.");
    [InitBasicFS, Always, TestOutput (
       (* Pick a file from cwd which isn't likely to change. *)
       [["upload"; "../COPYING.LIB"; "/COPYING.LIB"];
-       ["checksum"; "md5"; "/COPYING.LIB"]], "e3eda01d9815f8d24aae2dbd89b68b06")],
+       ["checksum"; "md5"; "/COPYING.LIB"]],
+        Digest.to_hex (Digest.file "COPYING.LIB"))],
    "upload a file from the local machine",
    "\
 Upload local file C<filename> to C<remotefilename> on the
@@ -1772,7 +1773,8 @@ See also C<guestfs_download>.");
       [["upload"; "../COPYING.LIB"; "/COPYING.LIB"];
        ["download"; "/COPYING.LIB"; "testdownload.tmp"];
        ["upload"; "testdownload.tmp"; "/upload"];
-       ["checksum"; "md5"; "/upload"]], "e3eda01d9815f8d24aae2dbd89b68b06")],
+       ["checksum"; "md5"; "/upload"]],
+        Digest.to_hex (Digest.file "COPYING.LIB"))],
    "download a file to the local machine",
    "\
 Download file C<remotefilename> and save it as C<filename>