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

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>

1 files changed, 20 insertions, 0 deletions

diff --git a/pactest/tests/upgrade013.py b/pactest/tests/upgrade013.py
new file mode 100644
index 00000000..5a327599
--- /dev/null
+++ b/pactest/tests/upgrade013.py
@@ -0,0 +1,20 @@
+self.description = "Install two packages with a conflicting file"
+
+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 %s" % " ".join([p.filename() for p in p1, p2])
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("!PKG_EXIST=dummy")
+self.addrule("!PKG_EXIST=foobar")