Attachment 852795 Details for Bug 1052762 – patch to handle results not linked to certifications

[patch] patch to handle results not linked to certifications

0004-1052762-hwcert-backend-certify-doesn-t-run-expected-.patch (text/plain), 3.35 KB, created by Greg Nichols on 2014-01-20 16:08:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-01-20 16:08:37 UTC

Size: 3.35 KB

patch

obsolete

>From f4e8e27f33086e39c1c8f6bf3fb37c8fe3c58ab7 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Mon, 20 Jan 2014 11:05:34 -0500
>Subject: [PATCH 4/4] 1052762 - hwcert-backend certify doesn't run expected
> tests
>
>---
> hwcert/catalog.py       | 12 +++++++++---
> hwcert/resultsengine.py | 32 +++++++++++++++++---------------
> 2 files changed, 26 insertions(+), 18 deletions(-)
>
>diff --git a/hwcert/catalog.py b/hwcert/catalog.py
>index dff95ab..8aa89e4 100644
>--- a/hwcert/catalog.py
>+++ b/hwcert/catalog.py
>@@ -265,12 +265,18 @@ class Catalog(Controller):
>                 return False
> 
>     def getOpenTests(self, resultsDocument):
>+        """ returns a list of open tests (possibly empty), or None if there's no 
>+        certification associated with the results. """
> 
>         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"
>+        if resultsDocument.getCertificationID() <= 0:
>+            print "There is no certification associated with these test results."
>+            if not self.getCertificationID(resultsDocument):
>+                return None
>+        # otherwise
>+        if not self.ui.promptConfirm("Would you like to check for open tests for this certification?"):
>+            print "Skipping checking of open tests"
>             return None
> 
>         # otherwise
>diff --git a/hwcert/resultsengine.py b/hwcert/resultsengine.py
>index f0344dd..3759889 100644
>--- a/hwcert/resultsengine.py
>+++ b/hwcert/resultsengine.py
>@@ -59,22 +59,24 @@ class ResultsEngine:
>                 if not test.isDeleted():
>                     remainingTests.append(test)
> 
>-        # if linked to an open certification, check the catalog for open tests
>-        if self.certification.getCertificationID():
>-            print "Checking catalog for open tests"
>-            openTests = catalog.getOpenTests(self.certification)
> 
>-            # filter remaining tests by open tests
>-            if openTests:
>-                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()
>+        print "Checking catalog for open tests"
>+        openTests = catalog.getOpenTests(self.certification)
>+
>+        # filter remaining tests by open tests
>+        if openTests == None: # no cert is assocated with the results, or skipped checking it.
>+            return remainingTests
>+
>+        if openTests: # if there's a list, (possibly empty)
>+            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.4.2
>

Actions: View | Diff

Attachments on bug 1052762: 852795