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=382b0bd050b121c2299dd7f7c7dd8cb901a3c041 commit 382b0bd050b121c2299dd7f7c7dd8cb901a3c041 Author: Guillem Jover <[email protected]> AuthorDate: Wed Oct 10 17:20:24 2012 +0200 t-file-replaces-disappear: Add a second file to be replaced This tests that not only the first file is properly replaced. --- t-file-replaces-disappear/Makefile | 16 ++++++++++++++-- .../pkg-file-original/DEBIAN/control | 2 +- .../pkg-file-original/test-other | 0 .../pkg-file-takeover/test-other | 0 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/t-file-replaces-disappear/Makefile b/t-file-replaces-disappear/Makefile index 04141c207..2cae893f5 100644 --- a/t-file-replaces-disappear/Makefile +++ b/t-file-replaces-disappear/Makefile @@ -12,7 +12,9 @@ test-case: $(TEST_CASES) define VERIFY test "`$(PKG_STATUS) pkg-file-takeover`" = "install ok installed" test "`$(DPKG_QUERY) -S /test-file`" = "pkg-file-takeover: /test-file" +test "`$(DPKG_QUERY) -S /test-other`" = "pkg-file-takeover: /test-other" cmp ref-file /test-file +cmp ref-file /test-other endef test-two-run-ordered: @@ -23,6 +25,7 @@ test-two-run-ordered: $(VERIFY) $(DPKG_PURGE) pkg-file-original pkg-file-takeover test ! -f /test-file + test ! -f /test-other test-one-run-ordered: # test-one-run-ordered @@ -31,6 +34,7 @@ test-one-run-ordered: $(VERIFY) $(DPKG_PURGE) pkg-file-original pkg-file-takeover test ! -f /test-file + test ! -f /test-other test-two-run-reverse: # test-two-run-reverse @@ -38,16 +42,24 @@ test-two-run-reverse: $(DPKG_INSTALL) pkg-file-original.deb test "`$(PKG_STATUS) pkg-file-original`" = "install ok installed" $(VERIFY) - $(DPKG_PURGE) pkg-file-original pkg-file-takeover + $(DPKG_PURGE) pkg-file-original + test -f /test-file + test -f /test-other + $(DPKG_PURGE) pkg-file-takeover test ! -f /test-file + test ! -f /test-other test-one-run-reverse: # test-one-run-reverse $(DPKG_INSTALL) pkg-file-takeover.deb pkg-file-original.deb test "`$(PKG_STATUS) pkg-file-original`" = "install ok installed" $(VERIFY) - $(DPKG_PURGE) pkg-file-original pkg-file-takeover + $(DPKG_PURGE) pkg-file-original + test -f /test-file + test -f /test-other + $(DPKG_PURGE) pkg-file-takeover test ! -f /test-file + test ! -f /test-other test-clean: $(DPKG_PURGE) pkg-file-original pkg-file-takeover diff --git a/t-file-replaces-disappear/pkg-file-original/DEBIAN/control b/t-file-replaces-disappear/pkg-file-original/DEBIAN/control index 305534f7b..4dae80f03 100644 --- a/t-file-replaces-disappear/pkg-file-original/DEBIAN/control +++ b/t-file-replaces-disappear/pkg-file-original/DEBIAN/control @@ -4,5 +4,5 @@ Section: test Priority: extra Maintainer: Dpkg Developers <[email protected]> Architecture: all -Description: test package - provide a file +Description: test package - provide some files diff --git a/t-conffile-replaces-disappear/pkg-conff-original/test-conffile b/t-file-replaces-disappear/pkg-file-original/test-other similarity index 100% copy from t-conffile-replaces-disappear/pkg-conff-original/test-conffile copy to t-file-replaces-disappear/pkg-file-original/test-other diff --git a/t-conffile-replaces-disappear/pkg-conff-takeover/test-conffile b/t-file-replaces-disappear/pkg-file-takeover/test-other similarity index 100% copy from t-conffile-replaces-disappear/pkg-conff-takeover/test-conffile copy to t-file-replaces-disappear/pkg-file-takeover/test-other -- Dpkg.Org's dpkg
