summaryrefslogtreecommitdiffstats
path: root/generator
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2010-11-30 10:33:08 +0000
committerRichard W.M. Jones <rjones@redhat.com>2010-11-30 10:40:09 +0000
commitba7ec6aea325b0a6df5777afc057df087f669a7b (patch)
tree3bed34bdb2c63ccaf1a34363e20140e1065bd170 /generator
parent6f09e4774ce64a15424a2601df10326d764cc7f7 (diff)
downloadlibguestfs-ba7ec6aea325b0a6df5777afc057df087f669a7b.tar.gz
libguestfs-ba7ec6aea325b0a6df5777afc057df087f669a7b.tar.xz
libguestfs-ba7ec6aea325b0a6df5777afc057df087f669a7b.zip
capitests: Use /dev/sdc for misc tests (instead of /dev/sdb).
This change means that /dev/sdb is not being used during the tests (except passively, eg. in listings of devices). This allows us (in a forthcoming commit) to use /dev/sdb as a quick scratch filesystem for testing writes.
Diffstat (limited to 'generator')
-rw-r--r--generator/generator_actions.ml18
1 files changed, 9 insertions, 9 deletions
diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml
index b4099388..d66ef9db 100644
--- a/generator/generator_actions.ml
+++ b/generator/generator_actions.ml
@@ -2661,10 +2661,10 @@ to return the existing UUID of a filesystem.");
("get_e2uuid", (RString "uuid", [Device "device"], []), 83, [DeprecatedBy "vfs_uuid"],
(* Regression test for RHBZ#597112. *)
(let uuid = uuidgen () in
- [InitBasicFS, Always, TestOutput (
- [["mke2journal"; "1024"; "/dev/sdb"];
- ["set_e2uuid"; "/dev/sdb"; uuid];
- ["get_e2uuid"; "/dev/sdb"]], uuid)]),
+ [InitNone, Always, TestOutput (
+ [["mke2journal"; "1024"; "/dev/sdc"];
+ ["set_e2uuid"; "/dev/sdc"; uuid];
+ ["get_e2uuid"; "/dev/sdc"]], uuid)]),
"get the ext2/3/4 filesystem UUID",
"\
This returns the ext2/3/4 filesystem UUID of the filesystem on
@@ -3979,12 +3979,12 @@ This command disables the libguestfs appliance swap on file.");
("swapon_label", (RErr, [String "label"], []), 174, [],
[InitEmpty, Always, TestRun (
- [["part_disk"; "/dev/sdb"; "mbr"];
- ["mkswap_L"; "swapit"; "/dev/sdb1"];
+ [["part_disk"; "/dev/sda"; "mbr"];
+ ["mkswap_L"; "swapit"; "/dev/sda1"];
["swapon_label"; "swapit"];
["swapoff_label"; "swapit"];
- ["zero"; "/dev/sdb"];
- ["blockdev_rereadpt"; "/dev/sdb"]])],
+ ["zero"; "/dev/sda"];
+ ["blockdev_rereadpt"; "/dev/sda"]])],
"enable swap on labeled swap partition",
"\
This command enables swap to a labeled swap partition.
@@ -4000,7 +4000,7 @@ labeled swap partition.");
("swapon_uuid", (RErr, [String "uuid"], []), 176, [Optional "linuxfsuuid"],
(let uuid = uuidgen () in
[InitEmpty, Always, TestRun (
- [["mkswap_U"; uuid; "/dev/sdb"];
+ [["mkswap_U"; uuid; "/dev/sdc"];
["swapon_uuid"; uuid];
["swapoff_uuid"; uuid]])]),
"enable swap on swap partition by UUID",