r1298 - trunk/v7

Author: gnichols Date: 2012-04-25 18:18:50 +0000 (Wed, 25 Apr 2012) New Revision: 1298 Modified: trunk/v7/fvtest.py Log: 816219 - fv storage and network tests may fail for multiple devices on guest Modified: trunk/v7/fvtest.py =================================================================== --- trunk/v7/fvtest.py 2012-04-25 18:18:20 UTC (rev 1297) +++ trunk/v7/fvtest.py 2012-04-25 18:18:50 UTC (rev 1298) @@ -516,22 +516,21 @@ # open the test results, and look for the run results = ResultsDocument() results.load(os.path.join(self.getOutputDirectory(), self.environment.getResultsFileName())) - test = results.getTest(self.testToRun) - if not test: + tests = results.getTests(self.testToRun) + if not tests: print "Error: no test " + self.testToRun + " in guest results" return False testRun = None - for run in test.getRuns(): - if run.getSummary() == Constants.PASS: - print test.getName() + " Passed" - return True - else: - print "Error: " + test.getName() + " run on guest Failed" - return False - + # if the test is run on multiple devices (storage, network), look for one that passed + for test in tests: + for run in test.getRuns(): + if run.getSummary() == Constants.PASS: + print test.getName() + " Passed" + return True # otherwise - print "Error: could not find test run for " + self.testToRun + print "Error: " + test.getName() + " run on guest Failed" return False + def run(self):