summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2008-07-05 10:48:26 +0200
committerDan McGee <dan@archlinux.org>2008-07-07 21:14:13 -0500
commit30702350fa442fd6d450f909cda7124369e68f77 (patch)
treef580277f225f98161a7139be330de4be0a20dc5b
parent72c0ab5c51d5119b6f81c768b1a0f6ff499df292 (diff)
Remove requiredby from pactests
Also remove some meaningless pactests (broken requiredby, requiredby*.py tests). requiredby001.py was renamed to upgrade076.py. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--pactest/tests/remove040.py3
-rw-r--r--pactest/tests/remove041.py2
-rw-r--r--pactest/tests/remove042.py2
-rw-r--r--pactest/tests/remove043.py3
-rw-r--r--pactest/tests/remove045.py3
-rw-r--r--pactest/tests/remove046.py10
-rw-r--r--pactest/tests/remove047.py1
-rw-r--r--pactest/tests/remove048.py10
-rw-r--r--pactest/tests/remove049.py1
-rw-r--r--pactest/tests/requiredby002.py16
-rw-r--r--pactest/tests/requiredby003.py16
-rw-r--r--pactest/tests/requiredby004.py20
-rw-r--r--pactest/tests/requiredby005.py21
-rw-r--r--pactest/tests/requiredby006.py21
-rw-r--r--pactest/tests/sync010.py2
-rw-r--r--pactest/tests/sync060.py15
-rw-r--r--pactest/tests/sync1000.py2
-rw-r--r--pactest/tests/sync300.py1
-rw-r--r--pactest/tests/sync400.py1
-rw-r--r--pactest/tests/sync895.py2
-rw-r--r--pactest/tests/sync896.py2
-rw-r--r--pactest/tests/sync900.py3
-rw-r--r--pactest/tests/sync901.py3
-rw-r--r--pactest/tests/upgrade052.py1
-rw-r--r--pactest/tests/upgrade053.py1
-rw-r--r--pactest/tests/upgrade054.py1
-rw-r--r--pactest/tests/upgrade055.py3
-rw-r--r--pactest/tests/upgrade056.py4
-rw-r--r--pactest/tests/upgrade057.py2
-rw-r--r--pactest/tests/upgrade058.py1
-rw-r--r--pactest/tests/upgrade059.py2
-rw-r--r--pactest/tests/upgrade060.py1
-rw-r--r--pactest/tests/upgrade061.py1
-rw-r--r--pactest/tests/upgrade073.py2
-rw-r--r--pactest/tests/upgrade076.py (renamed from pactest/tests/requiredby001.py)6
35 files changed, 2 insertions, 183 deletions
diff --git a/pactest/tests/remove040.py b/pactest/tests/remove040.py
index 07d3e67d..9d95b60e 100644
--- a/pactest/tests/remove040.py
+++ b/pactest/tests/remove040.py
@@ -6,13 +6,10 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
lp2.provides = ["imaginary"]
-lp2.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp2)
-
self.args = "-R %s" % lp1.name
self.addrule("PACMAN_RETCODE=0")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")
-self.addrule("!PKG_REQUIREDBY=pkg2|pkg1")
diff --git a/pactest/tests/remove041.py b/pactest/tests/remove041.py
index 9ab7bf74..be27fd4c 100644
--- a/pactest/tests/remove041.py
+++ b/pactest/tests/remove041.py
@@ -2,12 +2,10 @@ self.description = "Remove a no longer needed package (multiple provision)"
lp1 = pmpkg("pkg1")
lp1.provides = ["imaginary"]
-lp1.requiredby = ["pkg3"]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
lp2.provides = ["imaginary"]
-lp2.requiredby = ["pkg3"]
self.addpkg2db("local", lp2)
lp3 = pmpkg("pkg3")
diff --git a/pactest/tests/remove042.py b/pactest/tests/remove042.py
index 5de1fb41..796d0406 100644
--- a/pactest/tests/remove042.py
+++ b/pactest/tests/remove042.py
@@ -6,10 +6,8 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
lp2.provides = ["imaginary"]
-lp2.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp2)
-
self.args = "-Rc %s" % lp2.name
self.addrule("PACMAN_RETCODE=0")
diff --git a/pactest/tests/remove043.py b/pactest/tests/remove043.py
index a377c58b..0d448d0d 100644
--- a/pactest/tests/remove043.py
+++ b/pactest/tests/remove043.py
@@ -6,13 +6,10 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
lp2.provides = ["imaginary"]
-lp2.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp2)
-
self.args = "-R %s" % lp2.name
self.addrule("!PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")
-self.addrule("PKG_REQUIREDBY=pkg2|pkg1")
diff --git a/pactest/tests/remove045.py b/pactest/tests/remove045.py
index d8b7845b..f42e58f2 100644
--- a/pactest/tests/remove045.py
+++ b/pactest/tests/remove045.py
@@ -7,18 +7,15 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
lp2.reason = 1
lp2.depends = ["pkg4"]
-lp2.requiredby = ["pkg1"]
self.addpkg2db("local", lp2)
lp3 = pmpkg("pkg3")
lp3.reason = 1
-lp3.requiredby = ["pkg1", "pkg4"]
self.addpkg2db("local", lp3)
lp4 = pmpkg("pkg4")
lp4.reason = 1
lp4.depends = ["pkg3"]
-lp4.requiredby = ["pkg2"]
self.addpkg2db("local", lp4)
self.args = "-Rs %s" % lp1.name
diff --git a/pactest/tests/remove046.py b/pactest/tests/remove046.py
deleted file mode 100644
index 1ee8be17..00000000
--- a/pactest/tests/remove046.py
+++ /dev/null
@@ -1,10 +0,0 @@
-self.description = "Cascade remove a package with a broken required by"
-
-lp1 = pmpkg("pkg1")
-lp1.requiredby = [ "fake" ]
-self.addpkg2db("local", lp1)
-
-self.args = "-Rc %s" % lp1.name
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("!PKG_EXIST=pkg1")
diff --git a/pactest/tests/remove047.py b/pactest/tests/remove047.py
index 9606c2e3..8bb1a63a 100644
--- a/pactest/tests/remove047.py
+++ b/pactest/tests/remove047.py
@@ -1,7 +1,6 @@
self.description = "Remove a package required by other packages"
lp1 = pmpkg("pkg1")
-lp1.requiredby = ["pkg2", "pkg3", "pkg4"]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
diff --git a/pactest/tests/remove048.py b/pactest/tests/remove048.py
deleted file mode 100644
index 2d9b4803..00000000
--- a/pactest/tests/remove048.py
+++ /dev/null
@@ -1,10 +0,0 @@
-self.description = "Remove a package with a broken required by"
-
-lp1 = pmpkg("pkg1")
-lp1.requiredby = [ "dep" ]
-self.addpkg2db("local", lp1)
-
-self.args = "-R %s" % lp1.name
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("!PKG_EXIST=pkg1")
diff --git a/pactest/tests/remove049.py b/pactest/tests/remove049.py
index 724f8da2..a0336295 100644
--- a/pactest/tests/remove049.py
+++ b/pactest/tests/remove049.py
@@ -1,7 +1,6 @@
self.description = "-Ru test"
lp1 = pmpkg("pkg1")
-lp1.requiredby = [ "pkg3" ]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
diff --git a/pactest/tests/requiredby002.py b/pactest/tests/requiredby002.py
deleted file mode 100644
index 299ec88b..00000000
--- a/pactest/tests/requiredby002.py
+++ /dev/null
@@ -1,16 +0,0 @@
-self.description = "A package was removed with -Rd, then downgraded"
-
-lp1 = pmpkg("pkg1")
-lp1.depends = ["pkg2=1.1"]
-self.addpkg2db("local", lp1)
-
-p = pmpkg("pkg2", "1.0-1")
-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-1")
-self.addrule("PKG_EXIST=pkg2")
-self.addrule("!PKG_REQUIREDBY=pkg2|pkg1")
diff --git a/pactest/tests/requiredby003.py b/pactest/tests/requiredby003.py
deleted file mode 100644
index 3279c2ab..00000000
--- a/pactest/tests/requiredby003.py
+++ /dev/null
@@ -1,16 +0,0 @@
-self.description = "A package was removed with -Rd, then upgraded"
-
-lp1 = pmpkg("pkg1")
-lp1.depends = ["pkg2>=1.1"]
-self.addpkg2db("local", lp1)
-
-p = pmpkg("pkg2", "1.2-1")
-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.2-1")
-self.addrule("PKG_EXIST=pkg2")
-self.addrule("PKG_REQUIREDBY=pkg2|pkg1")
diff --git a/pactest/tests/requiredby004.py b/pactest/tests/requiredby004.py
deleted file mode 100644
index c4fe7687..00000000
--- a/pactest/tests/requiredby004.py
+++ /dev/null
@@ -1,20 +0,0 @@
-self.description = "Upgrade a package that no longer needs a depend"
-
-lp1 = pmpkg("pkg1")
-lp1.depends = ["pkg2"]
-self.addpkg2db("local", lp1)
-
-lp2 = pmpkg("pkg2")
-lp2.requiredby = ["pkg1"]
-self.addpkg2db("local", lp2)
-
-p = pmpkg("pkg1", "1.1-1")
-self.addpkg(p)
-
-self.args = "-U %s" % p.filename()
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_EXIST=pkg1")
-self.addrule("PKG_VERSION=pkg1|1.1-1")
-self.addrule("PKG_EXIST=pkg2")
-self.addrule("!PKG_REQUIREDBY=pkg2|pkg1")
diff --git a/pactest/tests/requiredby005.py b/pactest/tests/requiredby005.py
deleted file mode 100644
index 5b2ce164..00000000
--- a/pactest/tests/requiredby005.py
+++ /dev/null
@@ -1,21 +0,0 @@
-self.description = "Remove lp1, requiredby should move from lp1 to lp2"
-
-lp1 = pmpkg("foo")
-lp1.requiredby = ["pkg3"]
-self.addpkg2db("local", lp1)
-
-lp2 = pmpkg("pkg2")
-lp2.provides = ["foo"]
-self.addpkg2db("local", lp2)
-
-lp3 = pmpkg("pkg3")
-lp3.depends = ["foo"]
-self.addpkg2db("local", lp3)
-
-
-self.args = "-R %s" % lp1.name
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("!PKG_EXIST=foo")
-self.addrule("PKG_EXIST=pkg2")
-self.addrule("PKG_REQUIREDBY=pkg2|pkg3")
diff --git a/pactest/tests/requiredby006.py b/pactest/tests/requiredby006.py
deleted file mode 100644
index ea14cde5..00000000
--- a/pactest/tests/requiredby006.py
+++ /dev/null
@@ -1,21 +0,0 @@
-self.description = "Broken requiredby/depends list"
-
-lp1 = pmpkg("pkg1")
-lp1.depends = ["pkg2"]
-self.addpkg2db("local", lp1)
-
-lp2 = pmpkg("pkg2")
-lp2.requiredby = ["foo", "pkg1"]
-self.addpkg2db("local", lp2)
-
-p = pmpkg("pkg1", "1.1-1")
-p.depends = ["pkg2"]
-self.addpkg(p)
-
-self.args = "-U %s" % p.filename()
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_EXIST=pkg1")
-self.addrule("PKG_VERSION=pkg1|1.1-1")
-self.addrule("PKG_EXIST=pkg2")
-self.addrule("PKG_REQUIREDBY=pkg2|pkg1")
diff --git a/pactest/tests/sync010.py b/pactest/tests/sync010.py
index 7ddc1492..df407a32 100644
--- a/pactest/tests/sync010.py
+++ b/pactest/tests/sync010.py
@@ -25,5 +25,3 @@ for p in sp1, sp2, sp3:
for f in p.files:
self.addrule("FILE_EXIST=%s" % f)
self.addrule("PKG_DEPENDS=dep1|dep2")
-self.addrule("PKG_REQUIREDBY=dep1|dummy")
-self.addrule("PKG_REQUIREDBY=dep2|dep1")
diff --git a/pactest/tests/sync060.py b/pactest/tests/sync060.py
deleted file mode 100644
index 45f0c3e0..00000000
--- a/pactest/tests/sync060.py
+++ /dev/null
@@ -1,15 +0,0 @@
-self.description = "Replace a package with a broken required by"
-
-lp1 = pmpkg("pkg1")
-lp1.replaces = [ "pkg2" ]
-self.addpkg2db("sync", lp1)
-
-lp2 = pmpkg("pkg2")
-lp2.requiredby = [ "fake" ]
-self.addpkg2db("local", lp2)
-
-self.args = "-Su"
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_EXIST=pkg1")
-self.addrule("!PKG_EXIST=pkg2")
diff --git a/pactest/tests/sync1000.py b/pactest/tests/sync1000.py
index be1254bf..e7f43263 100644
--- a/pactest/tests/sync1000.py
+++ b/pactest/tests/sync1000.py
@@ -2,11 +2,9 @@
self.description = "stonecrest's problem"
sp = pmpkg("dummy", "1.1-1")
-sp.requiredby = [ "pkg" ]
self.addpkg2db("sync", sp)
lp1 = pmpkg("dummy", "1.0-1")
-lp1.requiredby = [ "pkg" ]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg")
diff --git a/pactest/tests/sync300.py b/pactest/tests/sync300.py
index 85fb850d..31b520a8 100644
--- a/pactest/tests/sync300.py
+++ b/pactest/tests/sync300.py
@@ -12,4 +12,3 @@ self.args = "-S %s" % sp1.name
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("!PKG_EXIST=pkg2")
-self.addrule("!PKG_REQUIREDBY=pkg2|pkg1")
diff --git a/pactest/tests/sync400.py b/pactest/tests/sync400.py
index 2ee1095d..dd6aaf4e 100644
--- a/pactest/tests/sync400.py
+++ b/pactest/tests/sync400.py
@@ -13,7 +13,6 @@ lp1.depends = ["pkg2=1.0-1"]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2", "1.0-1")
-lp2.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp2)
self.args = "-S pkg1"
diff --git a/pactest/tests/sync895.py b/pactest/tests/sync895.py
index 03ddc745..1b348c19 100644
--- a/pactest/tests/sync895.py
+++ b/pactest/tests/sync895.py
@@ -6,7 +6,6 @@ self.addpkg2db("sync", sp)
lp1 = pmpkg("pkg1")
lp1.provides = ["foo"]
-lp1.requiredby = ["pkg2"]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
@@ -19,4 +18,3 @@ self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")
self.addrule("!PKG_EXIST=pkg3")
-self.addrule("PKG_REQUIREDBY=pkg1|pkg2")
diff --git a/pactest/tests/sync896.py b/pactest/tests/sync896.py
index 830b7192..a89b5c70 100644
--- a/pactest/tests/sync896.py
+++ b/pactest/tests/sync896.py
@@ -7,7 +7,6 @@ self.addpkg2db("sync", sp)
lp1 = pmpkg("pkg1")
lp1.provides = ["foo"]
-lp1.requiredby = ["pkg2"]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
@@ -20,4 +19,3 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")
self.addrule("PKG_EXIST=pkg3")
-self.addrule("PKG_REQUIREDBY=pkg3|pkg2")
diff --git a/pactest/tests/sync900.py b/pactest/tests/sync900.py
index f21af06a..16dfee12 100644
--- a/pactest/tests/sync900.py
+++ b/pactest/tests/sync900.py
@@ -6,7 +6,6 @@ sp.conflicts = ["foo"]
self.addpkg2db("sync", sp)
lp = pmpkg("foo")
-lp.requiredby = ["lp1", "lp2"]
self.addpkg2db("local", lp)
lp1 = pmpkg("pkg1")
@@ -23,6 +22,4 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("!PKG_EXIST=foo")
self.addrule("PKG_EXIST=bar")
self.addrule("PKG_EXIST=pkg1")
-self.addrule("PKG_REQUIREDBY=bar|pkg1")
self.addrule("PKG_EXIST=pkg2")
-self.addrule("PKG_REQUIREDBY=bar|pkg2")
diff --git a/pactest/tests/sync901.py b/pactest/tests/sync901.py
index 423fe42c..bb420b79 100644
--- a/pactest/tests/sync901.py
+++ b/pactest/tests/sync901.py
@@ -6,7 +6,6 @@ self.addpkg2db("sync", sp)
lp = pmpkg("bar")
lp.provides = ["foo"]
lp.conflicts = ["foo"]
-lp.requiredby = ["lp1", "lp2"]
self.addpkg2db("local", lp)
lp1 = pmpkg("pkg1")
@@ -23,6 +22,4 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=foo")
self.addrule("!PKG_EXIST=bar")
self.addrule("PKG_EXIST=pkg1")
-self.addrule("PKG_REQUIREDBY=foo|pkg1")
self.addrule("PKG_EXIST=pkg2")
-self.addrule("PKG_REQUIREDBY=foo|pkg2")
diff --git a/pactest/tests/upgrade052.py b/pactest/tests/upgrade052.py
index 7db85df9..7000a12f 100644
--- a/pactest/tests/upgrade052.py
+++ b/pactest/tests/upgrade052.py
@@ -6,7 +6,6 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
lp2.provides = ["imaginary", "real"]
-lp2.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp2)
p = pmpkg("pkg2", "1.0-2")
diff --git a/pactest/tests/upgrade053.py b/pactest/tests/upgrade053.py
index 4cbaa1f8..78de0b5e 100644
--- a/pactest/tests/upgrade053.py
+++ b/pactest/tests/upgrade053.py
@@ -17,4 +17,3 @@ self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=pkg1|1.0-2")
self.addrule("PKG_EXIST=pkg2")
-self.addrule("PKG_REQUIREDBY=pkg2|pkg1")
diff --git a/pactest/tests/upgrade054.py b/pactest/tests/upgrade054.py
index b60f15f4..817d1b3d 100644
--- a/pactest/tests/upgrade054.py
+++ b/pactest/tests/upgrade054.py
@@ -17,4 +17,3 @@ self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=pkg1|1.0-2")
self.addrule("PKG_EXIST=pkg2")
-self.addrule("PKG_REQUIREDBY=pkg2|pkg1")
diff --git a/pactest/tests/upgrade055.py b/pactest/tests/upgrade055.py
index 7cdf6b5d..25083962 100644
--- a/pactest/tests/upgrade055.py
+++ b/pactest/tests/upgrade055.py
@@ -6,12 +6,10 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
lp2.provides = ["imaginary"]
-lp2.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp2)
lp3 = pmpkg("pkg3")
lp3.provides = ["imaginary2"]
-lp3.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp3)
p = pmpkg("pkg2", "1.0-2")
@@ -24,5 +22,4 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1")
self.addrule("PKG_VERSION=pkg2|1.0-2")
self.addrule("PKG_EXIST=pkg3")
-self.addrule("PKG_REQUIREDBY=pkg2|pkg1")
self.addrule("PKG_DEPENDS=pkg1|imaginary")
diff --git a/pactest/tests/upgrade056.py b/pactest/tests/upgrade056.py
index b92c38ac..908fa30c 100644
--- a/pactest/tests/upgrade056.py
+++ b/pactest/tests/upgrade056.py
@@ -6,12 +6,10 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
lp2.provides = ["imaginary"]
-lp2.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp2)
lp3 = pmpkg("pkg3")
lp3.provides = ["imaginary"]
-lp3.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp3)
p = pmpkg("pkg2", "1.0-2")
@@ -23,5 +21,3 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1")
self.addrule("PKG_VERSION=pkg2|1.0-2")
self.addrule("PKG_EXIST=pkg3")
-self.addrule("!PKG_REQUIREDBY=pkg2|pkg1")
-self.addrule("PKG_REQUIREDBY=pkg3|pkg1")
diff --git a/pactest/tests/upgrade057.py b/pactest/tests/upgrade057.py
index fd3e7138..b1eb5029 100644
--- a/pactest/tests/upgrade057.py
+++ b/pactest/tests/upgrade057.py
@@ -6,7 +6,6 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2")
lp2.provides = ["imag3"]
-lp2.requiredby = ["pkg1"]
self.addpkg2db("local", lp2)
p = pmpkg("pkg2", "1.0-2")
@@ -18,6 +17,5 @@ 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_REQUIREDBY=pkg2|pkg1")
self.addrule("PKG_DEPENDS=pkg1|pkg2")
self.addrule("PKG_DEPENDS=pkg1|imag3")
diff --git a/pactest/tests/upgrade058.py b/pactest/tests/upgrade058.py
index 109289ea..38576fff 100644
--- a/pactest/tests/upgrade058.py
+++ b/pactest/tests/upgrade058.py
@@ -5,7 +5,6 @@ lp1.depends = [ "pkg2=1.0" ]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2", "1.0-1")
-lp2.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp2)
p = pmpkg("pkg2", "1.1-1")
diff --git a/pactest/tests/upgrade059.py b/pactest/tests/upgrade059.py
index 933e4e74..9cd9f1f0 100644
--- a/pactest/tests/upgrade059.py
+++ b/pactest/tests/upgrade059.py
@@ -6,12 +6,10 @@ self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2", "1.0-1")
lp2.provides = ["imaginary"]
-lp2.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp2)
lp3 = pmpkg("pkg3", "1.0-1")
lp3.provides = ["imaginary"]
-lp3.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp3)
p2 = pmpkg("pkg2", "1.0-2")
diff --git a/pactest/tests/upgrade060.py b/pactest/tests/upgrade060.py
index dd78bba3..7a28f3eb 100644
--- a/pactest/tests/upgrade060.py
+++ b/pactest/tests/upgrade060.py
@@ -5,7 +5,6 @@ lp1.depends = ["pkg2=1.0"]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2", "1.0-1")
-lp2.requiredby = [ "pkg1" ]
self.addpkg2db("local", lp2)
p1 = pmpkg("pkg1", "1.1-1")
diff --git a/pactest/tests/upgrade061.py b/pactest/tests/upgrade061.py
index 0b1ed4e5..310e5043 100644
--- a/pactest/tests/upgrade061.py
+++ b/pactest/tests/upgrade061.py
@@ -5,7 +5,6 @@ lp1.depends = ["imaginary"]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2", "1.0-1")
-lp2.requiredby = [ "pkg1" ]
lp2.provides = ["imaginary"]
self.addpkg2db("local", lp2)
diff --git a/pactest/tests/upgrade073.py b/pactest/tests/upgrade073.py
index 3486c417..752a2336 100644
--- a/pactest/tests/upgrade073.py
+++ b/pactest/tests/upgrade073.py
@@ -21,8 +21,6 @@ self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=dummy|1.0-2")
self.addrule("PKG_DEPENDS=dummy|dep1")
self.addrule("PKG_DEPENDS=dep1|dep2")
-self.addrule("PKG_REQUIREDBY=dep1|dummy")
-self.addrule("PKG_REQUIREDBY=dep2|dep1")
for p in p1, p2, p3:
self.addrule("PKG_EXIST=%s" % p.name)
for f in p.files:
diff --git a/pactest/tests/requiredby001.py b/pactest/tests/upgrade076.py
index 0f05d82c..87ccbddf 100644
--- a/pactest/tests/requiredby001.py
+++ b/pactest/tests/upgrade076.py
@@ -1,11 +1,10 @@
-self.description = "A package is downgraded no longer satisfying a depend"
+self.description = "Package downgrade (failure)"
lp1 = pmpkg("pkg1")
lp1.depends = ["pkg2=1.1"]
self.addpkg2db("local", lp1)
lp2 = pmpkg("pkg2", "1.1-1")
-lp2.requiredby = ["pkg1"]
self.addpkg2db("local", lp2)
p = pmpkg("pkg2", "1.0-1")
@@ -15,6 +14,5 @@ self.args = "-U %s" % p.filename()
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_EXIST=pkg1")
-self.addrule("PKG_VERSION=pkg2|1.1-1")
self.addrule("PKG_EXIST=pkg2")
-self.addrule("PKG_REQUIREDBY=pkg2|pkg1")
+self.addrule("PKG_VERSION=pkg2|1.1-1")