rpms/libguestfs/EL-5 0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch, NONE, 1.1 libguestfs.spec, 1.55, 1.56

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31557

Modified Files:
	libguestfs.spec 
Added Files:
	0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch 
Log Message:
Another patch to try to fix the tests.

0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch:
 generator.ml |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

--- NEW FILE 0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch ---
>From 39e4f1dad208124640f0f795518390ba680a9704 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at trick.home.annexia.org>
Date: Fri, 7 Aug 2009 08:32:56 +0100
Subject: [PATCH 3/3] 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.
---
 src/generator.ml |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

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)
-- 
1.6.2.5



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- libguestfs.spec	6 Aug 2009 17:50:27 -0000	1.55
+++ libguestfs.spec	7 Aug 2009 07:37:09 -0000	1.56
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.66
-Release:     3%{?dist}
+Release:     4%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -14,6 +14,7 @@ BuildRoot:   %{_tmppath}/%{name}-%{versi
 
 Patch0:      0001-Tests-Don-t-test-block-size-in-statvfs-test.patch
 Patch1:      0002-Always-pass-mkswap-f-parameter.patch
+Patch2:      0003-Tests-swapon_device-test-mkswap-dev-sda1-instead-o.patch
 
 # Currently fails on PPC because:
 # "No Package Found for kernel"
@@ -311,6 +312,7 @@ mkdir -p daemon/m4
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -539,6 +541,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug  7 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-4
+- Another patch to try to fix the tests.
+
 * Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-3
 - New upstream release 1.0.66.
 - Incorporate upstream patches to fix some tests.