]> wolfpit.net Git - tool/Arch-pacman/.git/commitdiff
pactest: treat unknown rules as failures
authorAndrew Gregory <andrew.gregory.8@gmail.com>
Fri, 2 Aug 2013 02:51:24 +0000 (22:51 -0400)
committerAllan McRae <allan@archlinux.org>
Wed, 21 Aug 2013 01:00:18 +0000 (11:00 +1000)
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>
test/pacman/pmenv.py
test/pacman/pmtest.py

index 9a88262ee4c866879762a061b413b8816455dfc7..5eaa473ccc1e1ac2e523ecc617e34f4fb73ab7bf 100644 (file)
@@ -110,9 +110,8 @@ def _printtest(t):
             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
index f5a9680574e230f18174bf89d03f14801a95b1be..cea584da9725137dfb8e81996cbadf3529d33327 100644 (file)
@@ -266,11 +266,9 @@ def check(self):
             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: