Attachment 709036 Details for Bug 920733 – provide old script name to guest callers.

[patch] provide old script name to guest callers.

0001-provide-old-fv-script-name-v7-guest-script.patch (text/plain), 2.74 KB, created by Greg Nichols on 2013-03-12 15:52:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2013-03-12 15:52:29 UTC

Size: 2.74 KB

patch

obsolete

>From 38413374ca9d0fa867827cf85dc1f22d04223320 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Tue, 12 Mar 2013 11:49:13 -0400
>Subject: [PATCH] provide old fv script name v7-guest-script fix inconsistant
> naming of Constants.hwCertServerMinimumVersion
>
>---
> hwcert/fvtest.py       | 4 ++--
> hwcert/hardwaretest.py | 2 +-
> hwcert/tags.py         | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/hwcert/fvtest.py b/hwcert/fvtest.py
>index 3aa986e..856f164 100644
>--- a/hwcert/fvtest.py
>+++ b/hwcert/fvtest.py
>@@ -375,7 +375,7 @@ class FvTest(Test):
>             # copy the results to hwcertdata.imghp-dl580g5-01.rhts.bos.redhat.com
>             guestScript.write("mv /var/hwcert/results.xml /mnt/.\n")
>             # remove the tmp files
>-            guestScript.write("echo -e \'y\' | hwc clean\n")
>+            guestScript.write("echo -e \'y\' | hwc clean --mode auto\n")
>             # remove hwcert rpm
>             guestScript.write("rpm -e hwcert-client\n")          
>             # poweroff
>@@ -384,7 +384,7 @@ class FvTest(Test):
>             os.chmod(guestScriptFile, 0744)
>             # older images may call the old script from rc.local, so alias it here
>             # note that the data image must have hwcert-client and not v7.
>-            os.symlink(guestScriptFile, "v7-guest-script")
>+            os.symlink(guestScriptFile, "/mnt/v7-guest-script")
>             
>             self.unmountDataImage()
>             print "Submitted tests: " + commandToRun
>diff --git a/hwcert/hardwaretest.py b/hwcert/hardwaretest.py
>index ed88d67..c8e4e9f 100644
>--- a/hwcert/hardwaretest.py
>+++ b/hwcert/hardwaretest.py
>@@ -594,7 +594,7 @@ class HardwareTestHarness(Controller):
>                         hwcertServerVersion = match.group("version")
>                         hwcertServerRelease = match.group("release")
>                         print "Version %s Release %s" % (hwcertServerVersion, hwcertServerRelease)
>-                        if hwcertServerVersion + "." + hwcertServerRelease < Constants.hwcertserverMinimumVersion:
>+                        if hwcertServerVersion + "." + hwcertServerRelease < Constants.hwCertServerMinimumVersion:
>                             print "Error: HwCert server is from a prior release."
>                             print "This is a likely cause of test failures"
>                             result =  False
>diff --git a/hwcert/tags.py b/hwcert/tags.py
>index c3aef3d..6978acb 100644
>--- a/hwcert/tags.py
>+++ b/hwcert/tags.py
>@@ -156,7 +156,7 @@ class Constants:
>     memory =  "mem"
>     disk = "disk"
>     hwcertserverstatus = "hwcertserverstatus"
>-    hwcertserverMinimumVersion = "1.6"
>+    hwCertServerMinimumVersion = "1.6"
>     running = "running"
>     failed = "failed"
>     HwCert = "HwCert"
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 920733: 709036