This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=7ee5076261cf3b399abcb8f84aaac19546b685df commit 7ee5076261cf3b399abcb8f84aaac19546b685df Author: Ondřej Surý <[email protected]> AuthorDate: Wed May 11 10:58:20 2011 +0200 New t-dir-leftover-deadlock test-case Add test for leftover shared directories containing files purged from postrm (configuration files, logs, etc). Signed-off-by: Guillem Jover <[email protected]> --- Makefile | 1 + t-dir-leftover-deadlock/Makefile | 17 +++++++++++++++++ t-dir-leftover-deadlock/pkg-dir-shared-0/DEBIAN/control | 7 +++++++ .../pkg-dir-shared-0}/DEBIAN/postinst | 2 +- .../pkg-dir-shared-0}/DEBIAN/postrm | 2 +- .../pkg-dir-shared-0/test-dir/.keep0 | 0 t-dir-leftover-deadlock/pkg-dir-shared-1/DEBIAN/control | 8 ++++++++ .../pkg-dir-shared-1}/DEBIAN/postinst | 2 +- .../pkg-dir-shared-1}/DEBIAN/postrm | 2 +- .../pkg-dir-shared-1/test-dir/.keep1 | 0 10 files changed, 37 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 635579f2d..7487c974c 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ TESTS_MANUAL := \ TESTS_FAIL := \ t-dir-leftover-parents \ + t-dir-leftover-deadlock \ t-disappear-depended \ t-conffile-divert-conffile \ t-conffile-replaces-upgrade \ diff --git a/t-dir-leftover-deadlock/Makefile b/t-dir-leftover-deadlock/Makefile new file mode 100644 index 000000000..825d3312a --- /dev/null +++ b/t-dir-leftover-deadlock/Makefile @@ -0,0 +1,17 @@ +TESTS_DEB := pkg-dir-shared-0 pkg-dir-shared-1 + +include ../Test.mk + +test-case: + $(DPKG_INSTALL) pkg-dir-shared-0.deb + $(DPKG_INSTALL) pkg-dir-shared-1.deb + $(DPKG_REMOVE) pkg-dir-shared-1 + $(DPKG_REMOVE) pkg-dir-shared-0 + $(DPKG_PURGE) pkg-dir-shared-0 + $(DPKG_PURGE) pkg-dir-shared-1 + test ! -d /test-dir + +test-clean: + $(DPKG_PURGE) pkg-dir-shared-0 + $(DPKG_PURGE) pkg-dir-shared-1 + $(BEROOT) rm -rf /test-dir diff --git a/t-dir-leftover-deadlock/pkg-dir-shared-0/DEBIAN/control b/t-dir-leftover-deadlock/pkg-dir-shared-0/DEBIAN/control new file mode 100644 index 000000000..08c1df2ff --- /dev/null +++ b/t-dir-leftover-deadlock/pkg-dir-shared-0/DEBIAN/control @@ -0,0 +1,7 @@ +Package: pkg-dir-shared-0 +Version: 0 +Section: test +Priority: extra +Maintainer: Ondřej Surý <[email protected]> +Architecture: all +Description: test package - shared directory with configuration file diff --git a/t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postinst b/t-dir-leftover-deadlock/pkg-dir-shared-0/DEBIAN/postinst similarity index 53% copy from t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postinst copy to t-dir-leftover-deadlock/pkg-dir-shared-0/DEBIAN/postinst index b81b61747..0d6010757 100755 --- a/t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postinst +++ b/t-dir-leftover-deadlock/pkg-dir-shared-0/DEBIAN/postinst @@ -2,6 +2,6 @@ case "$1" in configure) - touch /test-dir/subdir/subsubdir/file + touch /test-dir/test-config-0 ;; esac diff --git a/t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postrm b/t-dir-leftover-deadlock/pkg-dir-shared-0/DEBIAN/postrm similarity index 52% copy from t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postrm copy to t-dir-leftover-deadlock/pkg-dir-shared-0/DEBIAN/postrm index 8ed1e1199..e87eb72c8 100755 --- a/t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postrm +++ b/t-dir-leftover-deadlock/pkg-dir-shared-0/DEBIAN/postrm @@ -2,6 +2,6 @@ case "$1" in purge) - rm /test-dir/subdir/subsubdir/file + rm /test-dir/test-config-0 ;; esac diff --git a/dpkgdb/available b/t-dir-leftover-deadlock/pkg-dir-shared-0/test-dir/.keep0 similarity index 100% copy from dpkgdb/available copy to t-dir-leftover-deadlock/pkg-dir-shared-0/test-dir/.keep0 diff --git a/t-dir-leftover-deadlock/pkg-dir-shared-1/DEBIAN/control b/t-dir-leftover-deadlock/pkg-dir-shared-1/DEBIAN/control new file mode 100644 index 000000000..70cfb27fb --- /dev/null +++ b/t-dir-leftover-deadlock/pkg-dir-shared-1/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-dir-shared-1 +Version: 0 +Section: test +Priority: extra +Maintainer: Ondřej Surý <[email protected]> +Architecture: all +Depends: pkg-dir-shared-0 +Description: test package - shared directory with configuration file diff --git a/t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postinst b/t-dir-leftover-deadlock/pkg-dir-shared-1/DEBIAN/postinst similarity index 53% copy from t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postinst copy to t-dir-leftover-deadlock/pkg-dir-shared-1/DEBIAN/postinst index b81b61747..1a2a5069e 100755 --- a/t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postinst +++ b/t-dir-leftover-deadlock/pkg-dir-shared-1/DEBIAN/postinst @@ -2,6 +2,6 @@ case "$1" in configure) - touch /test-dir/subdir/subsubdir/file + touch /test-dir/test-config-1 ;; esac diff --git a/t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postrm b/t-dir-leftover-deadlock/pkg-dir-shared-1/DEBIAN/postrm similarity index 52% copy from t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postrm copy to t-dir-leftover-deadlock/pkg-dir-shared-1/DEBIAN/postrm index 8ed1e1199..6b33b0354 100755 --- a/t-dir-leftover-parents/pkg-dir-shared-notempty/DEBIAN/postrm +++ b/t-dir-leftover-deadlock/pkg-dir-shared-1/DEBIAN/postrm @@ -2,6 +2,6 @@ case "$1" in purge) - rm /test-dir/subdir/subsubdir/file + rm /test-dir/test-config-1 ;; esac diff --git a/dpkgdb/available b/t-dir-leftover-deadlock/pkg-dir-shared-1/test-dir/.keep1 similarity index 100% copy from dpkgdb/available copy to t-dir-leftover-deadlock/pkg-dir-shared-1/test-dir/.keep1 -- Dpkg.Org's dpkg
