Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2018-05-29 13:57:13 +1000
committerAllan McRae <allan@archlinux.org>2018-08-10 12:38:03 +1000
commit7d05ffceaf9161a6572505d25b5017e1eb33bf0e (patch)
tree574de92ad35e6f1b65005327372b1a2a825f3e62 /test
parente4be26b7327d8378735205ebedfc9718fb6fbba1 (diff)
Remove the last traces of the pacman --force option
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test')
-rw-r--r--test/pacman/tests/TESTS5
-rw-r--r--test/pacman/tests/upgrade012.py14
-rw-r--r--test/pacman/tests/upgrade014.py23
-rw-r--r--test/pacman/tests/upgrade015.py14
-rw-r--r--test/pacman/tests/upgrade016.py15
-rw-r--r--test/pacman/tests/upgrade046.py31
6 files changed, 0 insertions, 102 deletions
diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS
index a9b4288c..b11cb511 100644
--- a/test/pacman/tests/TESTS
+++ b/test/pacman/tests/TESTS
@@ -276,11 +276,7 @@ TESTS += test/pacman/tests/upgrade005.py
TESTS += test/pacman/tests/upgrade006.py
TESTS += test/pacman/tests/upgrade010.py
TESTS += test/pacman/tests/upgrade011.py
-TESTS += test/pacman/tests/upgrade012.py
TESTS += test/pacman/tests/upgrade013.py
-TESTS += test/pacman/tests/upgrade014.py
-TESTS += test/pacman/tests/upgrade015.py
-TESTS += test/pacman/tests/upgrade016.py
TESTS += test/pacman/tests/upgrade020.py
TESTS += test/pacman/tests/upgrade021.py
TESTS += test/pacman/tests/upgrade022.py
@@ -299,7 +295,6 @@ TESTS += test/pacman/tests/upgrade041.py
TESTS += test/pacman/tests/upgrade042.py
TESTS += test/pacman/tests/upgrade043.py
TESTS += test/pacman/tests/upgrade045.py
-TESTS += test/pacman/tests/upgrade046.py
TESTS += test/pacman/tests/upgrade050.py
TESTS += test/pacman/tests/upgrade051.py
TESTS += test/pacman/tests/upgrade052.py
diff --git a/test/pacman/tests/upgrade012.py b/test/pacman/tests/upgrade012.py
deleted file mode 100644
index 4d9f0cd1..00000000
--- a/test/pacman/tests/upgrade012.py
+++ /dev/null
@@ -1,14 +0,0 @@
-self.description = "Install a package with a filesystem conflict (--force)"
-
-p = pmpkg("dummy")
-p.files = ["bin/dummy", "usr/man/man1/dummy.1"]
-self.addpkg(p)
-
-self.filesystem = ["bin/dummy"]
-
-self.args = "-U --force %s" % p.filename()
-
-self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_EXIST=dummy")
-self.addrule("FILE_MODIFIED=bin/dummy")
-self.addrule("FILE_EXIST=usr/man/man1/dummy.1")
diff --git a/test/pacman/tests/upgrade014.py b/test/pacman/tests/upgrade014.py
deleted file mode 100644
index 2ef759d1..00000000
--- a/test/pacman/tests/upgrade014.py
+++ /dev/null
@@ -1,23 +0,0 @@
-self.description = "Install two packages with a conflicting file (--force)"
-
-p1 = pmpkg("dummy")
-p1.files = ["bin/dummy",
- "usr/man/man1/dummy.1",
- "usr/common"]
-
-p2 = pmpkg("foobar")
-p2.files = ["bin/foobar",
- "usr/man/man1/foobar.1",
- "usr/common"]
-
-for p in p1, p2:
- self.addpkg(p)
-
-self.args = "-U --force %s" % " ".join([p.filename() for p in (p1, p2)])
-
-self.addrule("PACMAN_RETCODE=0")
-for p in p1, p2:
- self.addrule("PKG_EXIST=%s" % p.name)
- self.addrule("PKG_FILES=%s|usr/common" % p.name)
- for f in p.files:
- self.addrule("FILE_EXIST=%s" % f)
diff --git a/test/pacman/tests/upgrade015.py b/test/pacman/tests/upgrade015.py
deleted file mode 100644
index 64fe2813..00000000
--- a/test/pacman/tests/upgrade015.py
+++ /dev/null
@@ -1,14 +0,0 @@
-self.description = "Install a package with an existing file (--force)"
-
-p = pmpkg("dummy")
-p.files = ["etc/dummy.conf"]
-self.addpkg(p)
-
-self.filesystem = ["etc/dummy.conf"]
-
-self.args = "-U --force %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")
diff --git a/test/pacman/tests/upgrade016.py b/test/pacman/tests/upgrade016.py
deleted file mode 100644
index ddf57e8c..00000000
--- a/test/pacman/tests/upgrade016.py
+++ /dev/null
@@ -1,15 +0,0 @@
-self.description = "Install a package with an existing file (--force, new modified)"
-
-p = pmpkg("dummy")
-p.files = ["etc/dummy.conf*"]
-p.backup = ["etc/dummy.conf"]
-self.addpkg(p)
-
-self.filesystem = ["etc/dummy.conf"]
-
-self.args = "-U --force %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")
diff --git a/test/pacman/tests/upgrade046.py b/test/pacman/tests/upgrade046.py
deleted file mode 100644
index 0b59ca66..00000000
--- a/test/pacman/tests/upgrade046.py
+++ /dev/null
@@ -1,31 +0,0 @@
-self.description = "File relocation between two packages (reverse order, --force)"
-
-lp1 = pmpkg("dummy")
-lp1.files = ["bin/dummy"]
-
-lp2 = pmpkg("foobar")
-lp2.files = ["bin/foobar",
- "usr/share/file"]
-
-for p in lp1, lp2:
- self.addpkg2db("local", p)
-
-p1 = pmpkg("dummy")
-p1.files = ["bin/dummy",
- "usr/share/file"]
-
-p2 = pmpkg("foobar")
-p2.files = ["bin/foobar"]
-
-for p in p1, p2:
- self.addpkg(p)
-
-self.args = "-U --force %s" % " ".join([p.filename() for p in (p1, p2)])
-
-self.addrule("PACMAN_RETCODE=0")
-for p in p1, p2:
- self.addrule("PKG_EXIST=%s" % p.name)
-self.addrule("FILE_MODIFIED=bin/dummy")
-self.addrule("FILE_MODIFIED=bin/foobar")
-self.addrule("FILE_EXIST=usr/share/file")
-self.addrule("FILE_MODIFIED=usr/share/file")