From: Richard Jones <rjones@trick.home.annexia.org>
Date: Fri, 7 Aug 2009 07:32:56 +0000 (+0100)
Subject: Tests: swapon_device test mkswap /dev/sda1 instead of /dev/sdb.
X-Git-Tag: 1.0.67~60
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=39e4f1dad208124640f0f795518390ba680a9704;p=libguestfs.git

Tests: swapon_device test mkswap /dev/sda1 instead of /dev/sdb.

On RHEL 5, mkswap /dev/sdb fails, even with the '-f' option
(contradictory to what the manual page says).

This commit adds a new 'InitPartition' initialization which
just creates /dev/sda1, and then does the swap test on that.
---

diff --git a/src/generator.ml b/src/generator.ml
index 8b0fc66..fdf8f09 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -301,6 +301,12 @@ and test_init =
     (* Block devices are empty and no filesystems are mounted. *)
   | InitEmpty
 
+    (* /dev/sda contains a single partition /dev/sda1, with random
+     * content.  /dev/sdb and /dev/sdc may have random content.
+     * No LVM.
+     *)
+  | InitPartition
+
     (* /dev/sda contains a single partition /dev/sda1, which is formatted
      * as ext2, empty [except for lost+found] and mounted on /.
      * /dev/sdb and /dev/sdc may have random content.
@@ -3207,10 +3213,10 @@ C<alloc> command which allocates a file in the host and
 attaches it as a device.");
 
   ("swapon_device", (RErr, [String "device"]), 170, [],
-   [InitNone, Always, TestRun (
-      [["mkswap"; "/dev/sdb"];
-       ["swapon_device"; "/dev/sdb"];
-       ["swapoff_device"; "/dev/sdb"]])],
+   [InitPartition, Always, TestRun (
+      [["mkswap"; "/dev/sda1"];
+       ["swapon_device"; "/dev/sda1"];
+       ["swapoff_device"; "/dev/sda1"]])],
    "enable swap on device",
    "\
 This command enables the libguestfs appliance to use the
@@ -5318,6 +5324,13 @@ and generate_one_test_body name i test_name init test =
          [["blockdev_setrw"; "/dev/sda"];
           ["umount_all"];
           ["lvm_remove_all"]]
+   | InitPartition ->
+       pr "  /* InitPartition for %s: create /dev/sda1 */\n" test_name;
+       List.iter (generate_test_command_call test_name)
+         [["blockdev_setrw"; "/dev/sda"];
+          ["umount_all"];
+          ["lvm_remove_all"];
+          ["sfdiskM"; "/dev/sda"; ","]]
    | InitBasicFS ->
        pr "  /* InitBasicFS for %s: create ext2 on /dev/sda1 */\n" test_name;
        List.iter (generate_test_command_call test_name)