[pacman-dev] CVS update of pacman-lib/pactest (pmenv.py tests/upgrade056.py)

[Dan McGee]

    Date: Tuesday, February 27, 2007 @ 14:44:45
  Author: dan
    Path: /home/cvs-pacman/pacman-lib/pactest

   Added: tests/upgrade056.py (1.1)
Modified: pmenv.py (1.6 -> 1.7)

* Added another test- I believe it is a possible situation and one we need to
  deal with. Currently, libalpm with AND without Nagy's patch fails it.
* Slight spacing update to pmenv.py.


---------------------+
 pmenv.py            |    2 +-
 tests/upgrade056.py |   24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)


Index: pacman-lib/pactest/pmenv.py
diff -u pacman-lib/pactest/pmenv.py:1.6 pacman-lib/pactest/pmenv.py:1.7
--- pacman-lib/pactest/pmenv.py:1.6	Mon Feb 26 03:19:02 2007
+++ pacman-lib/pactest/pmenv.py	Tue Feb 27 14:44:45 2007
@@ -107,7 +107,7 @@
                 print "[PASSED]",
             else:
                 print "[FAILED]",
-            print "%s Rules:OK = %2u  FAIL = %2u  SKIP = %2u" \
+            print "%s Rules: OK = %2u  FAIL = %2u  SKIP = %2u" \
                     % (test.testname.ljust(32), success, fail, rules - (success + fail))
 
         print "=========="*8
Index: pacman-lib/pactest/tests/upgrade056.py
diff -u /dev/null pacman-lib/pactest/tests/upgrade056.py:1.1
--- /dev/null	Tue Feb 27 14:44:45 2007
+++ pacman-lib/pactest/tests/upgrade056.py	Tue Feb 27 14:44:45 2007
@@ -0,0 +1,24 @@
+self.description = "Upgrade a package that removes a provide but another package still does"
+
+lp1 = pmpkg("pkg1")
+lp1.depends = ["imaginary"]
+self.addpkg2db("local", lp1)
+
+lp2 = pmpkg("pkg2")
+lp2.provides = ["imaginary"]
+lp2.requiredby = [ "pkg1" ]
+self.addpkg2db("local", lp2)
+
+lp3 = pmpkg("pkg3")
+lp3.provides = ["imaginary"]
+self.addpkg2db("local", lp3)
+
+p = pmpkg("pkg2", "1.0-2")
+self.addpkg(p)
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_EXIST=pkg1")
+self.addrule("PKG_VERSION=pkg2|1.0-2")
+self.addrule("PKG_EXIST=pkg3")