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=550722473370c877c1111fad4b9fe073347d65f0 commit 550722473370c877c1111fad4b9fe073347d65f0 Author: Guillem Jover <[email protected]> AuthorDate: Sat Oct 25 00:31:08 2014 +0200 t-triggers: Add explicit await test cases --- t-triggers/Makefile | 20 +++++++++++++++----- t-triggers/pkg-trig-cmd/DEBIAN/postinst | 3 +++ t-triggers/pkg-trig-cmd/DEBIAN/postrm | 3 +++ t-triggers/pkg-trig-cmd/DEBIAN/preinst | 3 +++ t-triggers/pkg-trig-cmd/DEBIAN/prerm | 3 +++ .../DEBIAN/control | 1 - .../DEBIAN/postinst | 0 t-triggers/pkg-triggers-await/DEBIAN/triggers | 2 ++ 8 files changed, 29 insertions(+), 6 deletions(-) diff --git a/t-triggers/Makefile b/t-triggers/Makefile index 37a831a2a..9472f7298 100644 --- a/t-triggers/Makefile +++ b/t-triggers/Makefile @@ -1,11 +1,13 @@ -TESTS_DEB := pkg-triggers pkg-triggers-noawait pkg-trig-file \ - pkg-trig-explicit pkg-trig-cmd +TESTS_DEB := pkg-triggers pkg-triggers-await pkg-triggers-noawait \ + pkg-trig-file pkg-trig-explicit pkg-trig-cmd include ../Test.mk TEST_CASES += test-trigger-file TEST_CASES += test-trigger-explicit TEST_CASES += test-trigger-cmd +TEST_CASES += test-trigger-await-file +TEST_CASES += test-trigger-await-cmd TEST_CASES += test-trigger-noawait-file TEST_CASES += test-trigger-noawait-explicit TEST_CASES += test-trigger-noawait-cmd @@ -13,8 +15,12 @@ TEST_CASES += test-internal-db test-case: $(TEST_CASES) -test-trigger-file: - $(DPKG_UNPACK) pkg-triggers.deb +test-trigger-file test-trigger-await-file: + if [ "$@" = "test-trigger-file" ]; then \ + $(DPKG_UNPACK) pkg-triggers.deb; \ + else \ + $(DPKG_UNPACK) pkg-triggers-await.deb; \ + fi $(BEROOT) rm -f /a-trigger-ok /triggers/ok # When unpacked, triggers are not active $(DPKG_INSTALL) --no-triggers pkg-trig-file.deb @@ -217,7 +223,10 @@ test-trigger-noawait-explicit: $(DPKG_PURGE) pkg-triggers $(DPKG_PURGE) pkg-trig-explicit -test-trigger-cmd: +test-trigger-cmd test-trigger-await-cmd: + if [ "$@" = "test-trigger-await-cmd" ]; then \ + $(BEROOT) touch /trigger-await; \ + fi $(DPKG_UNPACK) pkg-triggers.deb $(BEROOT) rm -f /a-trigger-ok /triggers/ok # When unpacked, triggers are not active @@ -281,6 +290,7 @@ test-trigger-cmd: test -f /a-trigger-ok && $(BEROOT) rm -f /a-trigger-ok $(BEROOT) rm -f /trigger-postrm # Cleanup + $(BEROOT) rm -f /trigger-await $(DPKG_PURGE) pkg-triggers $(DPKG_PURGE) pkg-trig-cmd diff --git a/t-triggers/pkg-trig-cmd/DEBIAN/postinst b/t-triggers/pkg-trig-cmd/DEBIAN/postinst index 333cece41..2cf203902 100755 --- a/t-triggers/pkg-trig-cmd/DEBIAN/postinst +++ b/t-triggers/pkg-trig-cmd/DEBIAN/postinst @@ -6,6 +6,9 @@ if [ -e /trigger-$DPKG_MAINTSCRIPT_NAME ]; then if [ -e /trigger-noawait ]; then echo "Executing 'dpkg-trigger --no-await a-trigger' from '$0 $1'" dpkg-trigger --no-await a-trigger + elif [ -e /trigger-await ]; then + echo "Executing 'dpkg-trigger --await a-trigger' from '$0 $1'" + dpkg-trigger --await a-trigger else echo "Executing 'dpkg-trigger a-trigger' from '$0 $1'" dpkg-trigger a-trigger diff --git a/t-triggers/pkg-trig-cmd/DEBIAN/postrm b/t-triggers/pkg-trig-cmd/DEBIAN/postrm index 333cece41..2cf203902 100755 --- a/t-triggers/pkg-trig-cmd/DEBIAN/postrm +++ b/t-triggers/pkg-trig-cmd/DEBIAN/postrm @@ -6,6 +6,9 @@ if [ -e /trigger-$DPKG_MAINTSCRIPT_NAME ]; then if [ -e /trigger-noawait ]; then echo "Executing 'dpkg-trigger --no-await a-trigger' from '$0 $1'" dpkg-trigger --no-await a-trigger + elif [ -e /trigger-await ]; then + echo "Executing 'dpkg-trigger --await a-trigger' from '$0 $1'" + dpkg-trigger --await a-trigger else echo "Executing 'dpkg-trigger a-trigger' from '$0 $1'" dpkg-trigger a-trigger diff --git a/t-triggers/pkg-trig-cmd/DEBIAN/preinst b/t-triggers/pkg-trig-cmd/DEBIAN/preinst index 333cece41..2cf203902 100755 --- a/t-triggers/pkg-trig-cmd/DEBIAN/preinst +++ b/t-triggers/pkg-trig-cmd/DEBIAN/preinst @@ -6,6 +6,9 @@ if [ -e /trigger-$DPKG_MAINTSCRIPT_NAME ]; then if [ -e /trigger-noawait ]; then echo "Executing 'dpkg-trigger --no-await a-trigger' from '$0 $1'" dpkg-trigger --no-await a-trigger + elif [ -e /trigger-await ]; then + echo "Executing 'dpkg-trigger --await a-trigger' from '$0 $1'" + dpkg-trigger --await a-trigger else echo "Executing 'dpkg-trigger a-trigger' from '$0 $1'" dpkg-trigger a-trigger diff --git a/t-triggers/pkg-trig-cmd/DEBIAN/prerm b/t-triggers/pkg-trig-cmd/DEBIAN/prerm index 333cece41..2cf203902 100755 --- a/t-triggers/pkg-trig-cmd/DEBIAN/prerm +++ b/t-triggers/pkg-trig-cmd/DEBIAN/prerm @@ -6,6 +6,9 @@ if [ -e /trigger-$DPKG_MAINTSCRIPT_NAME ]; then if [ -e /trigger-noawait ]; then echo "Executing 'dpkg-trigger --no-await a-trigger' from '$0 $1'" dpkg-trigger --no-await a-trigger + elif [ -e /trigger-await ]; then + echo "Executing 'dpkg-trigger --await a-trigger' from '$0 $1'" + dpkg-trigger --await a-trigger else echo "Executing 'dpkg-trigger a-trigger' from '$0 $1'" dpkg-trigger a-trigger diff --git a/t-triggers/pkg-triggers-noawait/DEBIAN/control b/t-triggers/pkg-triggers-await/DEBIAN/control similarity index 99% copy from t-triggers/pkg-triggers-noawait/DEBIAN/control copy to t-triggers/pkg-triggers-await/DEBIAN/control index ff9d5d5b8..dc274531f 100644 --- a/t-triggers/pkg-triggers-noawait/DEBIAN/control +++ b/t-triggers/pkg-triggers-await/DEBIAN/control @@ -5,4 +5,3 @@ Priority: extra Maintainer: Dpkg Developers <[email protected]> Architecture: all Description: test package - providing triggers - diff --git a/t-triggers/pkg-triggers-noawait/DEBIAN/postinst b/t-triggers/pkg-triggers-await/DEBIAN/postinst similarity index 100% copy from t-triggers/pkg-triggers-noawait/DEBIAN/postinst copy to t-triggers/pkg-triggers-await/DEBIAN/postinst diff --git a/t-triggers/pkg-triggers-await/DEBIAN/triggers b/t-triggers/pkg-triggers-await/DEBIAN/triggers new file mode 100644 index 000000000..9ce7f675d --- /dev/null +++ b/t-triggers/pkg-triggers-await/DEBIAN/triggers @@ -0,0 +1,2 @@ +interest-await a-trigger +interest-await /triggers -- Dpkg.Org's dpkg
