Attachment 851183 Details for Bug 1054345 – patch to fix logic when no certification ID is set

[patch] patch to fix logic when no certification ID is set

0001-1054345-hwcert-stuck-in-loop-checking-catalog-for-ou.patch (text/plain), 2.49 KB, created by Greg Nichols on 2014-01-16 17:16:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-01-16 17:16:25 UTC

Size: 2.49 KB

patch

obsolete

>From e9dce47c299337a18ac32c749eea4e3ee593f44b Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Thu, 16 Jan 2014 12:15:10 -0500
>Subject: [PATCH] 1054345 - hwcert stuck in loop checking catalog for
> outstanding tests
>
>---
> hwcert/hardwarecertification.py |  2 +-
> hwcert/resultsengine.py         | 27 +++++++++++++++------------
> 2 files changed, 16 insertions(+), 13 deletions(-)
>
>diff --git a/hwcert/hardwarecertification.py b/hwcert/hardwarecertification.py
>index 2a18251..a3acf1f 100644
>--- a/hwcert/hardwarecertification.py
>+++ b/hwcert/hardwarecertification.py
>@@ -126,7 +126,7 @@ class HardwareCertification(HardwareTestHarness):
> 
>         if len(tests) == 0:
>             print "Testing appears to be complete."
>-            return True
>+            return False
> 
>         tests = self.addMandatoryTests(tests)
>         if not tests:
>diff --git a/hwcert/resultsengine.py b/hwcert/resultsengine.py
>index 260e615..acb6208 100644
>--- a/hwcert/resultsengine.py
>+++ b/hwcert/resultsengine.py
>@@ -59,19 +59,22 @@ class ResultsEngine:
>                 if not test.isDeleted():
>                     remainingTests.append(test)
> 
>-        openTests = catalog.getOpenTests(self.certification)
>+        # 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()
>+            # 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()
> 
>         return remainingTests
> 
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1054345: 851183