[pacman-dev] [PATCH] Add pactest for empty subdirectory conflict

[Allan McRae]

The wrong test file was inadvertantly committed in 44e9fdd0. Add the
correct test and tidy up the test which was committed.

Signed-off-by: Allan McRae <allan at archlinux.org>
---

Oops!

 test/pacman/tests/fileconflict011.py | 17 +++++++++++++++++
 test/pacman/tests/fileconflict012.py |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 test/pacman/tests/fileconflict011.py

diff --git a/test/pacman/tests/fileconflict011.py b/test/pacman/tests/fileconflict011.py
new file mode 100644
index 0000000..af48a06
--- /dev/null
+++ b/test/pacman/tests/fileconflict011.py
@@ -0,0 +1,17 @@
+self.description = "dir->file change during package upgrade (filesystem directory conflict)"
+
+lp1 = pmpkg("pkg1")
+lp1.files = ["dir/"]
+self.addpkg2db("local", lp1)
+
+self.filesystem = ["dir/conflict/"]
+
+p = pmpkg("pkg1", "1.0-2")
+p.files = ["dir"]
+self.addpkg2db("sync", p)
+
+self.args = "-S pkg1"
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_VERSION=pkg1|1.0-1")
+self.addrule("DIR_EXIST=dir/conflict/")
diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py
index 421b739..95ab568 100644
--- a/test/pacman/tests/fileconflict012.py
+++ b/test/pacman/tests/fileconflict012.py
@@ -14,4 +14,4 @@
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("PKG_VERSION=pkg1|1.0-1")
-self.addrule("DIR_EXIST=dir/")
+self.addrule("FILE_EXIST=dir/file")
-- 
1.7.11.1