bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move -A pactests that are relevant to -U, clean the rest out

Browse source 
This is in anticipation of removing the -A/--add option from the pacman
frontend. I've went through each of the pacman pactests that used the -A
operation and decided whether they were worth keeping, whether there was
already an upgrade test doing the same thing, or whether it should be moved
over.

The GIT rename log should make several of the moves obvious, but for those
that were deleted:
add001: handled by upgrade004
add002: worthless
add004: worthless
add010: handled by upgrade011
add050: handled by upgrade010

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2008-03-08 14:04:06 -06:00
parent 49197b7492
commit 266f06866b
23 changed files with 18 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pactest/tests/add001.py
View file

@ -1,13 +0,0 @@
self.description = "Install a simple package with two files"
p = pmpkg("dummy")
p.files = ["bin/dummy",
"usr/man/man1/dummy.1"]
self.addpkg(p)
self.args = "-A %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=dummy")
for f in p.files:
self.addrule("FILE_EXIST=%s" % f)

18
pactest/tests/add002.py
View file

@ -1,18 +0,0 @@
self.description = "Install an already-installed package"
lp = pmpkg("dummy")
lp.files = ["bin/dummy",
"usr/man/man1/dummy.1"]
self.addpkg2db("local", lp)
p = pmpkg("dummy")
p.files = ["bin/dummy",
"usr/man/man1/dummy.1"]
self.addpkg(p)
self.args = "-A %s" % p.filename()
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_MODIFIED=dummy")
for f in lp.files:
self.addrule("!FILE_MODIFIED=%s" % f)

18
pactest/tests/add004.py
View file

@ -1,18 +0,0 @@
self.description = "Install three of the same package at different versions"
p1 = pmpkg("dummy", "1.0-2")
p1.files = ["bin/dummy"]
p2 = pmpkg("dummy", "2.0-1")
p2.files = ["bin/dummy"]
p3 = pmpkg("dummy")
p3.files = ["bin/dummy"]
for p in p1, p2, p3:
self.addpkg(p)
self.args = "-A %s" % " ".join([p.filename() for p in p1, p2, p3])
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=dummy|2.0-1")
for f in p2.files:
self.addrule("FILE_EXIST=%s" % f)

15
pactest/tests/add010.py
View file

@ -1,15 +0,0 @@
self.description = "Install a package with a filesystem conflict"
p = pmpkg("dummy")
p.files = ["bin/dummy",
"usr/man/man1/dummy.1"]
self.addpkg(p)
self.filesystem = ["bin/dummy"]
self.args = "-A %s" % p.filename()
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=dummy")
self.addrule("!FILE_MODIFIED=bin/dummy")
self.addrule("!FILE_EXIST=usr/man/man1/dummy.1")

17
pactest/tests/add050.py
View file

@ -1,17 +0,0 @@
self.description = "Install a package with a file in NoUpgrade"
p = pmpkg("dummy")
p.files = ["etc/dummy.conf"]
p.backup = ["etc/dummy.conf"]
self.addpkg(p)
self.filesystem = ["etc/dummy.conf"]
self.option["noupgrade"] = ["etc/dummy.conf"]
self.args = "-Af %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=dummy")
self.addrule("!FILE_MODIFIED=etc/dummy.conf")
self.addrule("FILE_PACNEW=etc/dummy.conf")

2
pactest/tests/depconflict110.py
View file

@ -7,7 +7,7 @@ self.addpkg(p);
lp = pmpkg("pkg2", "1.0-1")
self.addpkg2db("local", lp)
self.args = "-A %s" % p.filename()
self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")

2
pactest/tests/depconflict111.py
View file

@ -7,7 +7,7 @@ self.addpkg(p);
lp = pmpkg("pkg2", "1.0-1")
self.addpkg2db("local", lp)
self.args = "-A %s" % p.filename()
self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")

2
pactest/tests/fileconflict001.py
View file

@ -13,7 +13,7 @@ p2 = pmpkg("pkg2")
p2.files = ["dir/symdir/file"]
self.addpkg(p2)
self.args = "-A %s" % " ".join([p.filename() for p in p1, p2])
self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")

2
pactest/tests/fileconflict002.py
View file

@ -9,7 +9,7 @@ p2 = pmpkg("pkg2")
p2.files = ["dir/symdir/file"]
self.addpkg(p2)
self.args = "-A %s" % " ".join([p.filename() for p in p1, p2])
self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")

2
pactest/tests/ldconfig001.py
View file

@ -6,7 +6,7 @@ p = pmpkg("dummy")
self.addpkg(p)
# --debug is necessary to check PACMAN_OUTPUT
self.args = "--debug -A %s" % p.filename()
self.args = "--debug -U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=ldconfig")

2
pactest/tests/smoke001.py
View file

@ -12,7 +12,7 @@ for i in range(1000):
_list = []
[_list.append(p.filename()) for p in self.localpkgs]
self.args = "-A %s" % " ".join(_list)
self.args = "-U %s" % " ".join(_list)
self.addrule("PACMAN_RETCODE=0")
#for i in range(1000):

2
pactest/tests/add003.py → pactest/tests/upgrade005.py
View file

@ -14,7 +14,7 @@ p3.files = ["bin/pkg3", "usr/man/man1/pkg3.1"]
for p in p1, p2, p3:
self.addpkg(p)
self.args = "-A %s" % " ".join([p.filename() for p in p1, p2, p3])
self.args = "-U %s" % " ".join([p.filename() for p in p1, p2, p3])
self.addrule("PACMAN_RETCODE=0")
for p in p1, p2, p3:

2
pactest/tests/add011.py → pactest/tests/upgrade012.py
View file

@ -6,7 +6,7 @@ self.addpkg(p)
self.filesystem = ["bin/dummy"]
self.args = "-Af %s" % p.filename()
self.args = "-Uf %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=dummy")

2
pactest/tests/add012.py → pactest/tests/upgrade013.py
View file

@ -13,7 +13,7 @@ p2.files = ["bin/foobar",
for p in p1, p2:
self.addpkg(p)
self.args = "-A %s" % " ".join([p.filename() for p in p1, p2])
self.args = "-U %s" % " ".join([p.filename() for p in p1, p2])
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=dummy")

2
pactest/tests/add013.py → pactest/tests/upgrade014.py
View file

@ -13,7 +13,7 @@ p2.files = ["bin/foobar",
for p in p1, p2:
self.addpkg(p)
self.args = "-Af %s" % " ".join([p.filename() for p in p1, p2])
self.args = "-Uf %s" % " ".join([p.filename() for p in p1, p2])
self.addrule("PACMAN_RETCODE=0")
for p in p1, p2:

2
pactest/tests/add020.py → pactest/tests/upgrade015.py
View file

@ -6,7 +6,7 @@ self.addpkg(p)
self.filesystem = ["etc/dummy.conf"]
self.args = "-Af %s" % p.filename()
self.args = "-Uf %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=dummy")

2
pactest/tests/add021.py → pactest/tests/upgrade016.py
View file

@ -7,7 +7,7 @@ self.addpkg(p)
self.filesystem = ["etc/dummy.conf"]
self.args = "-Af %s" % p.filename()
self.args = "-Uf %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=dummy")

2
pactest/tests/add060.py → pactest/tests/upgrade070.py
View file

@ -7,7 +7,7 @@ self.addpkg(p)
self.option["noextract"] = ["usr/man/man1/dummy.1"]
self.args = "-A %s" % p.filename()
self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=dummy")

2
pactest/tests/add040.py → pactest/tests/upgrade071.py
View file

@ -6,7 +6,7 @@ p.files = ["bin/dummy",
p.depends = ["dep1"]
self.addpkg(p)
self.args = "-A %s" % p.filename()
self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=dummy")

2
pactest/tests/add041.py → pactest/tests/upgrade072.py
View file

@ -6,7 +6,7 @@ p.files = ["bin/dummy",
p.depends = ["dep1"]
self.addpkg(p)
self.args = "-Ad %s" % p.filename()
self.args = "-Ud %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=dummy")

2
pactest/tests/add042.py → pactest/tests/upgrade073.py
View file

@ -15,7 +15,7 @@ p3.files = ["bin/dep2"]
for p in p1, p2, p3:
self.addpkg(p)
self.args = "-A %s" % " ".join([p.filename() for p in p1, p2, p3])
self.args = "-U %s" % " ".join([p.filename() for p in p1, p2, p3])
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=dummy|1.0-2")

2
pactest/tests/add046.py → pactest/tests/upgrade074.py
View file

@ -7,7 +7,7 @@ self.addpkg(p)
lp = pmpkg("pkg2", "1.9b-3")
self.addpkg2db("local", lp)
self.args = "-A %s" % p.filename()
self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1")

2
pactest/tests/add047.py → pactest/tests/upgrade075.py
View file

@ -7,7 +7,7 @@ self.addpkg(p)
lp = pmpkg("pkg2", "2.0-3")
self.addpkg2db("local", lp)
self.args = "-A %s" % p.filename()
self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")