Attachment 709030 Details for Bug 920726 – adds a symlink with the old script name. Also fixes hwCertServerMinimumVersion naming.

[patch] adds a symlink with the old script name. Also fixes hwCertServerMinimumVersion naming.

0001-add-alias-for-old-v7-guest-script-callers-fix.patch (text/plain), 3.19 KB, created by Greg Nichols on 2013-03-12 15:45:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2013-03-12 15:45:12 UTC

Size: 3.19 KB

patch

obsolete

>From 69972ff90c1ab8213b28652910bfb681d673ec72 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Tue, 12 Mar 2013 11:34:25 -0400
>Subject: [PATCH] add alias for old v7 guest script callers fix
> Constants.hwCertServerMinimumVersion inconsistancy
>
>---
> hwcert-client.spec.in    | 6 +++++-
> hwcert/fvtest.py         | 3 +++
> hwcert/tags.py           | 2 +-
> tests/network/network.py | 2 +-
> 4 files changed, 10 insertions(+), 3 deletions(-)
>
>diff --git a/hwcert-client.spec.in b/hwcert-client.spec.in
>index 275a892..ca1d663 100644
>--- a/hwcert-client.spec.in
>+++ b/hwcert-client.spec.in
>@@ -26,7 +26,7 @@ Requires: lmbench, dt, httpd, nfs-utils, stress, gcc, PyXML, rpm-build
> Requires: dbus-python, kernel-devel, kernel-headers, sos
> 
> # hwcert-server subpackage
>-%package server
>+%package -n hwcert-server
> Summary:        Red Hat Hardware Test Suite Server
> Group:          Development/Tools
> Requires: hwcert-client = %{version}-%{release}
>@@ -74,6 +74,10 @@ DESTDIR=$RPM_BUILD_ROOT make HWCERT_RHEL_VERSION=%{rhel_version} install
> 
> 
> %changelog
>+* Mon Mar 11 2013 Greg Nichols <gnichols@redhat.com>
>+
>+  910406 - [1.7] v7 tracebacks when <partner-server> is empty or missing from /etc/v7.xml
>+  
> * Fri Mar 08 2013 Greg Nichols <gnichols@redhat.com>
> 
> hwcert-client 1.7.0 R14
>diff --git a/hwcert/fvtest.py b/hwcert/fvtest.py
>index 40207d7..f5b2d32 100644
>--- a/hwcert/fvtest.py
>+++ b/hwcert/fvtest.py
>@@ -363,6 +363,9 @@ class FvTest(Test):
>             guestScript.write("poweroff\n")
>             guestScript.close()
>             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, "/mnt/v7-guest-script")
>             
>             self.unmountDataImage()
>             print "Submitted tests: " + commandToRun
>diff --git a/hwcert/tags.py b/hwcert/tags.py
>index 41855ba..0dadd3b 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"
>diff --git a/tests/network/network.py b/tests/network/network.py
>index 45cf994..4a9cb22 100644
>--- a/tests/network/network.py
>+++ b/tests/network/network.py
>@@ -121,7 +121,7 @@ class NetworkTest(Test):
>                         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:
>                             errors.append("Error: V7 server %s is from a prior release (%s-%s)." % (self.getTestServer(), hwcertServerVersion, hwcertServerRelease))
>                             result =  False
>                     match = statusPattern.search(line)
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 920726: 709030 | 757110