From 429b956fb2d21309cae0560d6d98225969447737 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Thu, 1 Aug 2013 22:51:24 -0400 Subject: pactest: treat unknown rules as failures Tests should only be skipped when they aren't relevant, not when the test itself is bad. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- test/pacman/pmenv.py | 5 ++--- test/pacman/pmtest.py | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py index 9a88262e..5eaa473c 100644 --- a/test/pacman/pmenv.py +++ b/test/pacman/pmenv.py @@ -110,9 +110,8 @@ class pmenv(object): else: result = "[FAIL]" print result, - print "%s Rules: OK = %2u FAIL = %2u SKIP = %2u" \ - % (t.testname.ljust(34), success, fail, \ - rules - (success + fail)) + print "%s Rules: OK = %2u FAIL = %2u" \ + % (t.testname.ljust(34), success, fail) if fail != 0: # print test description if test failed print " ", t.description diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index f5a96805..cea584da 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -266,11 +266,9 @@ class pmtest(object): if success == 1: msg = " OK " self.result["success"] += 1 - elif success == 0: + else: msg = "FAIL" self.result["fail"] += 1 - else: - msg = "SKIP" print "\t[%s] %s" % (msg, i) # vim: set ts=4 sw=4 et: -- cgit v1.2.3-70-g09d2