* Indentation changes - 4 spaces for python, we standardized this before (and

it's a PEP)
* Modified some sync tests

pactest/pactest.py

@@ -71,3 +71,4 @@ if __name__ == "__main__":
 
     env.run()
     env.results()
+# vim: set ts=4 sw=4 et:

pactest/pmdb.py

@@ -344,8 +344,8 @@ class pmdb:
         if not oldpkg:
             return 0
 
-		dbg("oldpkg.checksum : %s" % oldpkg.checksum)
-		dbg("oldpkg.mtime    : %s" % oldpkg.mtime)
+        #dbg("oldpkg.checksum : %s" % oldpkg.checksum)
+        #dbg("oldpkg.mtime    : %s" % oldpkg.mtime)
 
         for key in pkg.mtime.keys():
             if key == "install" \
@@ -361,3 +361,4 @@ class pmdb:
 if __name__ == "__main__":
     db = pmdb("local")
     print db
+# vim: set ts=4 sw=4 et:

pactest/pmenv.py

@@ -78,7 +78,7 @@ class pmenv:
 
             t.check()
             print "==> Test result"
-			if t.result["ko"] == 0:
+            if t.result["fail"] == 0:
                 print "\tPASSED"
             else:
                 print "\tFAILED"
@@ -92,17 +92,17 @@ class pmenv:
         print "Results"
         print "----------"*8
         for test in self.testcases:
-			ok = test.result["ok"]
-			ko = test.result["ko"]
+            success = test.result["success"]
+            fail = test.result["fail"]
             rules = len(test.rules)
-			if ko == 0:
+            if fail == 0:
                 print "[PASSED]",
                 passed += 1
             else:
                 print "[FAILED]",
             print test.name.strip(".py").ljust(38),
             print "Rules:",
-			print "OK = %2u KO = %2u SKIP = %2u" % (ok, ko, rules-(ok+ko))
+            print " OK = %2u  FAIL = %2u  SKIP = %2u" % (success, fail, rules-(success+fail))
         print "----------"*8
         total = len(self.testcases)
         failed = total - passed
@@ -116,3 +116,4 @@ class pmenv:
 if __name__ == "__main__":
     env = pmenv("/tmp")
     print env
+# vim: set ts=4 sw=4 et:

pactest/pmfile.py

@@ -63,3 +63,4 @@ class pmfile:
 if __name__ == "__main__":
     f = pmfile("/tmp", "foobar")
     print f
+# vim: set ts=4 sw=4 et:

pactest/pmpkg.py

@@ -178,3 +178,4 @@ class pmpkg:
 if __name__ == "__main__":
     pkg = pmpkg("dummy")
     print pkg
+# vim: set ts=4 sw=4 et:

pactest/pmrule.py

@@ -63,8 +63,8 @@ class pmrule:
             if not newpkg:
                 success = 0
             else:
-				dbg("newpkg.checksum : %s" % newpkg.checksum)
-				dbg("newpkg.mtime    : %s" % newpkg.mtime)
+                #dbg("newpkg.checksum : %s" % newpkg.checksum)
+                #dbg("newpkg.mtime    : %s" % newpkg.mtime)
                 if case == "EXIST":
                     success = 1
                 elif case == "MODIFIED":
@@ -131,3 +131,4 @@ class pmrule:
 
 if __name__ != "__main__":
     rule = pmrule("PKG_EXIST=dummy")
+# vim: set ts=4 sw=4 et:

pactest/pmtest.py

@@ -65,8 +65,8 @@ class pmtest:
 
         # Reset test parameters
         self.result = {
-			"ok": 0,
-			"ko": 0
+            "success": 0,
+            "fail": 0
         }
         self.args = ""
         self.retcode = 0
@@ -216,7 +216,7 @@ class pmtest:
         os.chdir(curdir)
 
         # Check if pacman failed because of bad permissions
-		if self.retcode \
+        if self.retcode and not pacman["nolog"] \
            and grep(os.path.join(self.root, LOGFILE),
                     "you cannot perform this operation unless you are root"):
             print "\tERROR: pacman support for fakeroot is not disabled"
@@ -237,11 +237,11 @@ class pmtest:
         for i in self.rules:
             success = i.check(self.root, self.retcode, self.db["local"], self.files)
             if success == 1:
-				msg = "OK"
-				self.result["ok"] += 1
+                msg = " OK "
+                self.result["success"] += 1
             elif success == 0:
-				msg = "KO"
-				self.result["ko"] += 1
+                msg = "FAIL"
+                self.result["fail"] += 1
             else:
                 msg = "SKIP"
             print "\t[%s] %s" % (msg, i.rule)
@@ -251,3 +251,4 @@ class pmtest:
 if __name__ == "__main__":
     test = pmtest("test1", "./root")
     print test
+# vim: set ts=4 sw=4 et:

pactest/tests/sync897.py

@@ -24,3 +24,4 @@ self.args = "-Su"
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=pkg1")
 self.addrule("!PKG_EXIST=pkg2")
+self.addrule("!PKG_EXIST=pkg3")

pactest/tests/sync899.py

@@ -1,4 +1,4 @@
-self.description = "System upgrade"
+self.description = "System upgrade - conflict/provide with an installed package"
 
 sp1 = pmpkg("pkg1", "1.0-2")
 sp1.conflicts = ["pkg2"]

pactest/util.py

@@ -257,3 +257,4 @@ def grep(filename, pattern):
 
 if __name__ == "__main__":
     pass
+# vim: set ts=4 sw=4 et: