Attachment 730941 Details for Bug 919498 – add call to hardware catalog to check open tests

[patch] add call to hardware catalog to check open tests

0001-919498-Feat-change-the-test-suite-command-set-to-att.patch (text/plain), 4.26 KB, created by Greg Nichols on 2013-04-02 19:36:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2013-04-02 19:36:04 UTC

Size: 4.26 KB

patch

obsolete

>From 2ac54baec89b0ed7d32fce816e16812393e81e68 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Tue, 2 Apr 2013 15:33:52 -0400
>Subject: [PATCH] 919498 - Feat: change the test suite command set to attempt
> to certify the system by default.
>
>---
> hwcert/catalog.py               | 41 ++++++++++++++++++++++++++++++++++++++++-
> hwcert/hardwarecertification.py |  4 +---
> hwcert/resultsengine.py         | 18 +++++++++++++++++-
> 3 files changed, 58 insertions(+), 5 deletions(-)
>
>diff --git a/hwcert/catalog.py b/hwcert/catalog.py
>index f892d0c..3a83ffd 100644
>--- a/hwcert/catalog.py
>+++ b/hwcert/catalog.py
>@@ -204,4 +204,43 @@ class Catalog(Controller):
>             print "Error: could not submit certification results:"
>             print e
>             return False
>-        
>\ No newline at end of file
>+
>+    def getOpenTests(self, resultsDocument):
>+
>+        openTests = list()
>+
>+        if resultsDocument.getCertificationID() <= 0 or not self.ui.promptConfirm("Would you like to check for open tests for this certification?"):
>+            if self.debug != Constants.off:
>+                print "Skipping checking of open tests"
>+            return None
>+
>+        # otherwise
>+        if not self.login or not self.password:
>+            self.login = self.ui.prompt("Red Hat Catalog User Name: ")
>+            self.password = self.ui.promptPassword("Password: ")
>+
>+        sys.stdout.write("Checking certification...")
>+        serverProxy = xmlrpclib.ServerProxy(self.environment.getCatalogURL())
>+        try:
>+            params = {"login":self.login, 
>+                      "password":self.password, 
>+                      "certid":resultsDocument.getCertificationID()}
>+
>+            response = serverProxy.Cert.getOpenTests(params)
>+            print " done."
>+            if self.debug != Constants.off:
>+                print response
>+
>+            openTests = response
>+
>+            return openTests
>+
>+        except xmlrpclib.Fault, error:
>+            print "Error: could not get test plan from hardware catalog:"
>+            print "    Fault code: %s" % error.faultCode
>+            print "    Fault string: %s" % error.faultString
>+            return None
>+        except Exception, e:
>+            print "Error: could not check open tests."
>+            print e
>+            return None
>diff --git a/hwcert/hardwarecertification.py b/hwcert/hardwarecertification.py
>index 56d4d87..11d6ed4 100644
>--- a/hwcert/hardwarecertification.py
>+++ b/hwcert/hardwarecertification.py
>@@ -117,9 +117,7 @@ class HardwareCertification(HardwareTestHarness):
>         self.disablePassedTests()
> 
>         engine = ResultsEngine(self.certification)
>-        # currently 1.5 doesn't support catalog access.  If it did, the call would be:
>-        # tests = engine.getRemainingTests(self.catalog)
>-        tests = engine.getRemainingTests()
>+        tests = engine.getRemainingTests(self.catalog)
> 
>         # for realtime kernel, just look for remaining realtime tests
>         if self.isRealtime():
>diff --git a/hwcert/resultsengine.py b/hwcert/resultsengine.py
>index c7a75fb..717c494 100644
>--- a/hwcert/resultsengine.py
>+++ b/hwcert/resultsengine.py
>@@ -25,7 +25,7 @@ class ResultsEngine:
>         self.certification = certification
> 
> 
>-    def getRemainingTests(self):
>+    def getRemainingTests(self, catalog):
>         tests = self.certification.getTests()
>         mandatoryTests = self.certification.getMandatoryTests()
>         passedTests = dict()
>@@ -57,6 +57,22 @@ class ResultsEngine:
>             except:
>                 if not test.isDeleted():
>                     remainingTests.append(test)
>+
>+        openTests = catalog.getOpenTests(self.certification)
>+        
>+        # filter remaining tests by open tests
>+        if openTests is not None:
>+            if len(openTests) > 0:
>+                print "The following tests are still open: %s" % (", ".join(openTests)).lower()
>+                tests = remainingTests
>+                remainingTests = list()
>+                for test in tests:
>+                    if test.getName().upper() in openTests:
>+                        remainingTests.append(test)
>+            else:
>+                print "There are no open tests remaining in the certification"
>+                return list()
>+        
>         return remainingTests
>             
> 
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 919498: 730941