summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-08-02 04:51:24 +0200
committerAllan McRae <allan@archlinux.org>2013-08-21 03:00:18 +0200
commit429b956fb2d21309cae0560d6d98225969447737 (patch)
tree027cf0acfea67d349edf77a385ac912060f68fc0
parentd3726bbd26769b1ab7cdbedda109db31bdfb0f78 (diff)
downloadpacman-429b956fb2d21309cae0560d6d98225969447737.tar.gz
pacman-429b956fb2d21309cae0560d6d98225969447737.tar.xz
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 <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--test/pacman/pmenv.py5
-rw-r--r--test/pacman/pmtest.py4
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: