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=42e5cc51a2f8b70de667858a34f398f370c1e4c1 commit 42e5cc51a2f8b70de667858a34f398f370c1e4c1 Author: Raphaël Hertzog <[email protected]> AuthorDate: Thu Nov 21 10:43:49 2013 +0100 t-file-replaces-versioned: New test case This one checks moving a file from package A to B when a A/0 and B/0 are both initially installed. B/1 has a replaces on A (<< 1) to avoid the file conflict. [[email protected]: - Wrap TESTS_DEB assignment line. - Remove blank lines. - Remove Replaces in pkg-file-takeover-0. - Hook into TESTS_PASS. ] Signed-off-by: Guillem Jover <[email protected]> --- Makefile | 1 + .../Makefile | 22 +++++++++++++++------- .../pkg-file-original-0}/DEBIAN/control | 1 - .../pkg-file-original-0}/test-file | 0 .../pkg-file-original-0}/test-original | 0 .../pkg-file-original-1}/DEBIAN/control | 3 +-- .../pkg-file-original-1}/test-original | 0 .../pkg-file-takeover-0}/DEBIAN/control | 4 +--- .../pkg-file-takeover-0}/test-takeover | 0 .../pkg-file-takeover-1}/DEBIAN/control | 5 ++--- .../pkg-file-takeover-1}/test-file | 0 .../pkg-file-takeover-1}/test-takeover | 0 .../ref-file | 0 13 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index c120d096f..e78714f2f 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,7 @@ TESTS_PASS += t-triggers TESTS_PASS += t-triggers-path TESTS_PASS += t-file-replaces TESTS_PASS += t-file-replaces-disappear +TESTS_PASS += t-file-replaces-versioned TESTS_PASS += t-conffile-normal TESTS_PASS += t-conffile-obsolete TESTS_PASS += t-conffile-orphan diff --git a/t-file-replaces/Makefile b/t-file-replaces-versioned/Makefile similarity index 53% copy from t-file-replaces/Makefile copy to t-file-replaces-versioned/Makefile index ee4db119e..43ce2e913 100644 --- a/t-file-replaces/Makefile +++ b/t-file-replaces-versioned/Makefile @@ -1,4 +1,5 @@ -TESTS_DEB := pkg-file-original pkg-file-takeover +TESTS_DEB := pkg-file-original-0 pkg-file-original-1 \ + pkg-file-takeover-0 pkg-file-takeover-1 include ../Test.mk @@ -18,27 +19,34 @@ endef test-two-run-ordered: # test-two-run-ordered - $(DPKG_INSTALL) pkg-file-original.deb - $(DPKG_INSTALL) pkg-file-takeover.deb + $(DPKG_INSTALL) pkg-file-original-0.deb pkg-file-takeover-0.deb + $(DPKG_INSTALL) pkg-file-original-1.deb + $(DPKG_INSTALL) pkg-file-takeover-1.deb $(VERIFY) $(DPKG_PURGE) pkg-file-original pkg-file-takeover test-one-run-ordered: # test-one-run-ordered - $(DPKG_INSTALL) pkg-file-original.deb pkg-file-takeover.deb + $(DPKG_INSTALL) pkg-file-original-0.deb pkg-file-takeover-0.deb + $(DPKG_INSTALL) pkg-file-original-1.deb pkg-file-takeover-1.deb + $(DPKG_CONFIGURE) -a $(VERIFY) $(DPKG_PURGE) pkg-file-original pkg-file-takeover test-two-run-reverse: # test-two-run-reverse - $(DPKG_INSTALL) pkg-file-takeover.deb - $(DPKG_INSTALL) pkg-file-original.deb + $(DPKG_INSTALL) pkg-file-original-0.deb pkg-file-takeover-0.deb + $(DPKG_INSTALL) pkg-file-takeover-1.deb + $(DPKG_INSTALL) pkg-file-original-1.deb $(VERIFY) $(DPKG_PURGE) pkg-file-original pkg-file-takeover test-one-run-reverse: # test-one-run-reverse - $(DPKG_INSTALL) pkg-file-takeover.deb pkg-file-original.deb + $(DPKG_INSTALL) pkg-file-original-0.deb pkg-file-takeover-0.deb + $(DPKG_INSTALL) pkg-file-takeover-1.deb pkg-file-original-1.deb $(VERIFY) $(DPKG_PURGE) pkg-file-original pkg-file-takeover +test-clean: + $(DPKG_PURGE) pkg-file-original pkg-file-takeover diff --git a/t-file-replaces/pkg-file-original/DEBIAN/control b/t-file-replaces-versioned/pkg-file-original-0/DEBIAN/control similarity index 99% copy from t-file-replaces/pkg-file-original/DEBIAN/control copy to t-file-replaces-versioned/pkg-file-original-0/DEBIAN/control index 305534f7b..93bb7723f 100644 --- a/t-file-replaces/pkg-file-original/DEBIAN/control +++ b/t-file-replaces-versioned/pkg-file-original-0/DEBIAN/control @@ -5,4 +5,3 @@ Priority: extra Maintainer: Dpkg Developers <[email protected]> Architecture: all Description: test package - provide a file - diff --git a/t-file-replaces-disappear/pkg-file-original/test-file b/t-file-replaces-versioned/pkg-file-original-0/test-file similarity index 100% copy from t-file-replaces-disappear/pkg-file-original/test-file copy to t-file-replaces-versioned/pkg-file-original-0/test-file diff --git a/t-conffile-replaces-downgrade/pkg-conff-original-0/test-original b/t-file-replaces-versioned/pkg-file-original-0/test-original similarity index 100% copy from t-conffile-replaces-downgrade/pkg-conff-original-0/test-original copy to t-file-replaces-versioned/pkg-file-original-0/test-original diff --git a/t-file-replaces/pkg-file-original/DEBIAN/control b/t-file-replaces-versioned/pkg-file-original-1/DEBIAN/control similarity index 93% copy from t-file-replaces/pkg-file-original/DEBIAN/control copy to t-file-replaces-versioned/pkg-file-original-1/DEBIAN/control index 305534f7b..8c5a7421e 100644 --- a/t-file-replaces/pkg-file-original/DEBIAN/control +++ b/t-file-replaces-versioned/pkg-file-original-1/DEBIAN/control @@ -1,8 +1,7 @@ Package: pkg-file-original -Version: 0 +Version: 1 Section: test Priority: extra Maintainer: Dpkg Developers <[email protected]> Architecture: all Description: test package - provide a file - diff --git a/t-conffile-replaces-downgrade/pkg-conff-original-0/test-original b/t-file-replaces-versioned/pkg-file-original-1/test-original similarity index 100% copy from t-conffile-replaces-downgrade/pkg-conff-original-0/test-original copy to t-file-replaces-versioned/pkg-file-original-1/test-original diff --git a/t-file-replaces-disappear/pkg-file-takeover/DEBIAN/control b/t-file-replaces-versioned/pkg-file-takeover-0/DEBIAN/control similarity index 64% copy from t-file-replaces-disappear/pkg-file-takeover/DEBIAN/control copy to t-file-replaces-versioned/pkg-file-takeover-0/DEBIAN/control index 6af91c890..913a3a8b7 100644 --- a/t-file-replaces-disappear/pkg-file-takeover/DEBIAN/control +++ b/t-file-replaces-versioned/pkg-file-takeover-0/DEBIAN/control @@ -4,6 +4,4 @@ Section: test Priority: extra Maintainer: Dpkg Developers <[email protected]> Architecture: all -Replaces: pkg-file-original -Description: test package - file replaces takeover - +Description: test package - future file replaces takeover diff --git a/t-conffile-replaces-downgrade/pkg-conff-takeover/test-takeover b/t-file-replaces-versioned/pkg-file-takeover-0/test-takeover similarity index 100% copy from t-conffile-replaces-downgrade/pkg-conff-takeover/test-takeover copy to t-file-replaces-versioned/pkg-file-takeover-0/test-takeover diff --git a/t-file-replaces-disappear/pkg-file-takeover/DEBIAN/control b/t-file-replaces-versioned/pkg-file-takeover-1/DEBIAN/control similarity index 80% copy from t-file-replaces-disappear/pkg-file-takeover/DEBIAN/control copy to t-file-replaces-versioned/pkg-file-takeover-1/DEBIAN/control index 6af91c890..4c130a933 100644 --- a/t-file-replaces-disappear/pkg-file-takeover/DEBIAN/control +++ b/t-file-replaces-versioned/pkg-file-takeover-1/DEBIAN/control @@ -1,9 +1,8 @@ Package: pkg-file-takeover -Version: 0 +Version: 1 Section: test Priority: extra Maintainer: Dpkg Developers <[email protected]> Architecture: all -Replaces: pkg-file-original +Replaces: pkg-file-original (<< 1) Description: test package - file replaces takeover - diff --git a/t-file-replaces-disappear/pkg-file-takeover/test-file b/t-file-replaces-versioned/pkg-file-takeover-1/test-file similarity index 100% copy from t-file-replaces-disappear/pkg-file-takeover/test-file copy to t-file-replaces-versioned/pkg-file-takeover-1/test-file diff --git a/t-conffile-replaces-downgrade/pkg-conff-takeover/test-takeover b/t-file-replaces-versioned/pkg-file-takeover-1/test-takeover similarity index 100% copy from t-conffile-replaces-downgrade/pkg-conff-takeover/test-takeover copy to t-file-replaces-versioned/pkg-file-takeover-1/test-takeover diff --git a/t-file-replaces-disappear/ref-file b/t-file-replaces-versioned/ref-file similarity index 100% copy from t-file-replaces-disappear/ref-file copy to t-file-replaces-versioned/ref-file -- Dpkg.Org's dpkg
