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=d45f967c2dc8d834e6b8e50a2a1d179ce62907c6 commit d45f967c2dc8d834e6b8e50a2a1d179ce62907c6 Author: Guillem Jover <[email protected]> AuthorDate: Tue Mar 30 11:35:01 2010 +0200 Add t-conflict-provide-replace test-cases for real and virtual packages --- Makefile | 4 +++- t-conflict-provide-replace-real/Makefile | 13 +++++++++++++ .../pkg-a/DEBIAN/control | 2 +- .../pkg-a/test-conflict | 0 .../pkg-b/DEBIAN/control | 5 ++++- .../pkg-b}/test-conflict | 0 {t-conflict => t-conflict-provide-replace-virtual}/Makefile | 0 .../pkg-a/DEBIAN/control | 5 ++++- .../pkg-b/DEBIAN/control | 5 ++++- 9 files changed, 29 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 87efd6b00..9d02ea214 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,15 @@ # # Dpkg functional testsuite (kind of) # -# Copyright © 2008, 2009 Guillem Jover <[email protected]> +# Copyright © 2008-2010 Guillem Jover <[email protected]> # TESTS := \ t-normal \ t-disappear \ t-conflict \ + t-conflict-provide-replace-real \ + t-conflict-provide-replace-virtual \ t-file-replaces \ t-file-replaces-disappear \ t-conffile-obsolete \ diff --git a/t-conflict-provide-replace-real/Makefile b/t-conflict-provide-replace-real/Makefile new file mode 100644 index 000000000..84334ce1a --- /dev/null +++ b/t-conflict-provide-replace-real/Makefile @@ -0,0 +1,13 @@ +TESTS_DEB := pkg-a pkg-b + +include ../Test.mk + +test-case: + $(DPKG_INSTALL) pkg-a.deb + # test if the replacing package takes over on install + $(DPKG_INSTALL) pkg-b.deb + +test-clean: + $(DPKG_PURGE) pkg-b + -$(DPKG_PURGE) pkg-a + diff --git a/t-conflict/pkg-a/DEBIAN/control b/t-conflict-provide-replace-real/pkg-a/DEBIAN/control similarity index 70% copy from t-conflict/pkg-a/DEBIAN/control copy to t-conflict-provide-replace-real/pkg-a/DEBIAN/control index 6242d8f74..1b0529788 100644 --- a/t-conflict/pkg-a/DEBIAN/control +++ b/t-conflict-provide-replace-real/pkg-a/DEBIAN/control @@ -4,5 +4,5 @@ Section: test Priority: extra Maintainer: Guillem Jover <[email protected]> Architecture: all -Description: test package - conflicting file +Description: test package - package to be replaced diff --git a/t-conflict/pkg-a/test-conflict b/t-conflict-provide-replace-real/pkg-a/test-conflict similarity index 100% copy from t-conflict/pkg-a/test-conflict copy to t-conflict-provide-replace-real/pkg-a/test-conflict diff --git a/t-conflict/pkg-b/DEBIAN/control b/t-conflict-provide-replace-real/pkg-b/DEBIAN/control similarity index 56% copy from t-conflict/pkg-b/DEBIAN/control copy to t-conflict-provide-replace-real/pkg-b/DEBIAN/control index 86801872b..a825f0d4d 100644 --- a/t-conflict/pkg-b/DEBIAN/control +++ b/t-conflict-provide-replace-real/pkg-b/DEBIAN/control @@ -4,5 +4,8 @@ Section: test Priority: extra Maintainer: Guillem Jover <[email protected]> Architecture: all -Description: test package - conflicting file +Conflicts: pkg-a +Provides: pkg-a +Replaces: pkg-a +Description: test package - replacing package diff --git a/t-conflict/pkg-a/test-conflict b/t-conflict-provide-replace-real/pkg-b/test-conflict similarity index 100% copy from t-conflict/pkg-a/test-conflict copy to t-conflict-provide-replace-real/pkg-b/test-conflict diff --git a/t-conflict/Makefile b/t-conflict-provide-replace-virtual/Makefile similarity index 100% copy from t-conflict/Makefile copy to t-conflict-provide-replace-virtual/Makefile diff --git a/t-conflict/pkg-a/DEBIAN/control b/t-conflict-provide-replace-virtual/pkg-a/DEBIAN/control similarity index 55% copy from t-conflict/pkg-a/DEBIAN/control copy to t-conflict-provide-replace-virtual/pkg-a/DEBIAN/control index 6242d8f74..d7a1bcfd3 100644 --- a/t-conflict/pkg-a/DEBIAN/control +++ b/t-conflict-provide-replace-virtual/pkg-a/DEBIAN/control @@ -4,5 +4,8 @@ Section: test Priority: extra Maintainer: Guillem Jover <[email protected]> Architecture: all -Description: test package - conflicting file +Conflicts: pkg-v +Provides: pkg-v +Replaces: pkg-v +Description: test package - conflicting virtual diff --git a/t-conflict/pkg-b/DEBIAN/control b/t-conflict-provide-replace-virtual/pkg-b/DEBIAN/control similarity index 55% copy from t-conflict/pkg-b/DEBIAN/control copy to t-conflict-provide-replace-virtual/pkg-b/DEBIAN/control index 86801872b..e76f2ae54 100644 --- a/t-conflict/pkg-b/DEBIAN/control +++ b/t-conflict-provide-replace-virtual/pkg-b/DEBIAN/control @@ -4,5 +4,8 @@ Section: test Priority: extra Maintainer: Guillem Jover <[email protected]> Architecture: all -Description: test package - conflicting file +Conflicts: pkg-v +Provides: pkg-v +Replaces: pkg-v +Description: test package - conflicting virtual -- Dpkg.Org's dpkg
