Attachment 877290 Details for Bug 1079358 – patch fixing --server, adding validation

[patch] patch fixing --server, adding validation

0004-1079358-hwcert-backend-plan-ignores-server-on-first-.patch (text/plain), 4.70 KB, created by Greg Nichols on 2014-03-21 14:05:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-03-21 14:05:04 UTC

Size: 4.70 KB

patch

obsolete

>From 18e2928fbcb9a6d39d26d9a096d86cc86c777f13 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Fri, 21 Mar 2014 10:04:06 -0400
>Subject: [PATCH 4/4] 1079358 - hwcert-backend plan ignores --server on first
> run
>
>---
> hwcert/harness.py         | 36 +++++++++++++++++++++++-------------
> hwcert/localTestServer.py | 16 ++++++++++++++--
> 2 files changed, 37 insertions(+), 15 deletions(-)
>
>diff --git a/hwcert/harness.py b/hwcert/harness.py
>index 58b985b..7680a44 100644
>--- a/hwcert/harness.py
>+++ b/hwcert/harness.py
>@@ -363,7 +363,7 @@ class HardwareTestHarness(Controller):
>     def doContinue(self):
>         self.load()
>         tests = self.certification.getIncompleteTestsFromLastRun()
>-        if not tests:
>+        if len(tests) is 0:
>             print "All tests in the last test run are complete"
>             return False
>         # tests = self.addMandatoryTests(tests) don't re-do mandatory tests on a continue.
>@@ -391,11 +391,8 @@ class HardwareTestHarness(Controller):
>             print ""
> 
>         # determine test server
>-        if self.options.server:
>-            self.certification.setTestServer(self.options.server)
>-        else:
>-             if self.certification.getTestServer():
>-                 self.options.server = self.certification.getTestServer()
>+        if not self.options.server and self.certification.getTestServer():
>+            self.options.server = self.certification.getTestServer()
> 
> 
>         # Set up our system logging stuff
>@@ -817,6 +814,8 @@ class HardwareTestHarness(Controller):
>                     if separator in model:
>                         vendor = model.split(separator)[0]
>                         model = model.split(separator)[1]
>+                        # try and use the first word of model as the make
>+                        make = model.split()[0]
>                         break
>             except:
>                 pass
>@@ -1119,16 +1118,27 @@ class HardwareTestHarness(Controller):
>                     print "Error: %s is not an integer." % value
>             if value and int(value) >= 0:
>                 self.certification.setCertificationID(value)
>-        
>+
>         # set a local test server
>-        print "Please provide the local Hardware Certification Test Server:"
>-        value = self.certification.getTestServer()
>-        value = self.ui.promptEdit("    hostname:", value)
>-        if len(value) > 0:
>-            self.certification.setTestServer(value)
>+        serverHostname = self.options.server
>+        if not serverHostname:
>+            serverHostname = self.certification.getTestServer()
>+        while True:
>+            print "Please provide the local Hardware Certification Test Server:"
>+            serverHostname = self.ui.promptEdit("    hostname:", serverHostname)
>+            if len(serverHostname) == 0:
>+                break
>+            # validate the hostname (but don't verify).
>+            server = LocalTestServer(serverHostname)
>+            if server.getHostname():
>+                if server.getHostname() != serverHostname:
>+                    print "Setting Test Server to %s" % server.getHostname()
>+                self.certification.setTestServer(server.getHostname())
>+                break
>+            # otherwise
>+            print "Error: \"%s\" is not a valid host name."
> 
>         # copy over to certification.xml
>         certificationDocument = CertificationDocument()
>         certificationDocument.copy(self.certification)
>         certificationDocument.save(self.environment.getCertificationPath())
>-
>diff --git a/hwcert/localTestServer.py b/hwcert/localTestServer.py
>index c1b53e7..12ce195 100644
>--- a/hwcert/localTestServer.py
>+++ b/hwcert/localTestServer.py
>@@ -15,15 +15,23 @@
> #
> # localTestServer.py: hwcert client interface to the hwcert local test server
> 
>-import urllib2, re
>+import urllib2, re, urlparse
> 
> from hwcert.tags import Constants
> 
> class LocalTestServer():
>     def __init__(self, hostname):
>-        self.hostname = hostname
>+        self.hostname = None
>         self.status = None
>         self.errors = list()
>+        # pull the host out of a url, if that's what we got.
>+        url = urlparse.urlparse(hostname)
>+        if url.netloc:
>+            self.hostname = url.netloc
>+        else:
>+            pattern = re.compile("[\w\.\-]+$")
>+            if pattern.match(hostname):
>+                self.hostname = hostname
> 
>     def getStatus(self):
>         if not self.status:
>@@ -38,6 +46,10 @@ class LocalTestServer():
> 
>     def verify(self):
>         self.errors = list()
>+        if not self.hostname:
>+            self.errors.append("Error: no hostname is set")
>+            return False
>+
>         print "\nVerifying hwcert Server %s:" % self.hostname
>         result = True
>         try:
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1079358: 877290