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=6d5623a4170644c738fcd91f2a14a899acbbd405 commit 6d5623a4170644c738fcd91f2a14a899acbbd405 Author: Guillem Jover <[email protected]> AuthorDate: Thu Oct 11 06:41:24 2012 +0200 Verify that conffiles got correctly obsoleted on package replaces --- t-conffile-replaces-existing-and-upgrade/Makefile | 6 ++++++ t-conffile-replaces-upgrade/Makefile | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/t-conffile-replaces-existing-and-upgrade/Makefile b/t-conffile-replaces-existing-and-upgrade/Makefile index a77d84203..f265a5d3a 100644 --- a/t-conffile-replaces-existing-and-upgrade/Makefile +++ b/t-conffile-replaces-existing-and-upgrade/Makefile @@ -10,10 +10,16 @@ TEST_CASES += test-one-run-reverse test-case: $(TEST_CASES) +define CONFFILES +$(DPKG_QUERY) -f '$${Package} @ $${Conffiles}\n' +endef + define VERIFY test "`$(PKG_STATUS) pkg-conff-original`" = "install ok installed" test "`$(PKG_STATUS) pkg-conff-takeover`" = "install ok installed" test "`$(DPKG_QUERY) -S /test-conffile`" = "pkg-conff-takeover: /test-conffile" +test "`$(CONFFILES) -W pkg-conff-original | grep obsolete | wc -l`" = "1" +test "`$(CONFFILES) -W pkg-conff-takeover | grep -v obsolete | wc -l`" = "1" cmp ref-conffile /test-conffile endef diff --git a/t-conffile-replaces-upgrade/Makefile b/t-conffile-replaces-upgrade/Makefile index e3a3be25a..4fd8134f8 100644 --- a/t-conffile-replaces-upgrade/Makefile +++ b/t-conffile-replaces-upgrade/Makefile @@ -9,11 +9,17 @@ TEST_CASES += test-one-run-reverse test-case: $(TEST_CASES) +define CONFFILES +$(DPKG_QUERY) -f '$${Package} @ $${Conffiles}\n' +endef + define VERIFY test "`$(PKG_STATUS) pkg-conff-original`" = "install ok installed" test "`$(PKG_STATUS) pkg-conff-takeover`" = "install ok installed" test "`$(DPKG_QUERY) -S /test-conffile`" = "pkg-conff-takeover: /test-conffile" test "`$(DPKG_QUERY) -S /test-confpath`" = "pkg-conff-takeover: /test-confpath" +test "`$(CONFFILES) -W pkg-conff-original | grep obsolete | wc -l`" = "2" +test "`$(CONFFILES) -W pkg-conff-takeover | grep -v obsolete | wc -l`" = "2" cmp ref-conffile /test-conffile cmp ref-conffile /test-confpath endef -- Dpkg.Org's dpkg
