This is an automated email from the git hooks/post-receive script.
periapt pushed a commit to branch master
in repository devscripts.
commit 140fdf1372ff387d264719a23090d8a052bb4218
Author: Nicholas Bamber <nicho...@periapt.co.uk>
Date: Sat Dec 5 20:44:03 2015 +0000
Rearranged cleanup of tests to use oneTimeSetUp/oneTimeTearDown
---
debian/changelog | 1 +
debian/rules | 4 ---
test/test_package_lifecycle | 79 ++++++++++++++++++++++++---------------------
test/test_uscan_mangle | 33 ++++++++++++-------
4 files changed, 65 insertions(+), 52 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 157ada9..576b561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
files from Artistic and Mozilla licenses
* Added test for life cycle of package:
+ debuild, dscverify, dscextract, list-unreleased, debdiff
+ * Rearranged cleanup of tests to use oneTimeSetUp/oneTimeTearDown
[ Dominique Dumont ]
* licensecheck:
diff --git a/debian/rules b/debian/rules
index 804ad62..d107992 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,3 @@ else
dh_gencontrol -- -V'vendor:Suggests='
-V'vendor:Recommends=$(UBU_SUGGESTS)'
endif
-override_dh_clean:
- dh_clean
- rm -rf test/uscan/gpg test/package_lifecycle
-
diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle
index 41be7ed..9a91a7f 100755
--- a/test/test_package_lifecycle
+++ b/test/test_package_lifecycle
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
# Copyright (C) 2015, Nicholas Bamber <nicho...@periapt.co.uk>
#
@@ -26,40 +26,42 @@ else
export PATH PERL5LIB
fi
-GPG=/usr/bin/gpg
-if [ ! -x $GPG ];then
- echo "$GPG missing"
- GPG=/usr/bin/gpg2
- if [ ! -x $GPG ];then
- echo "$GPG missing"
- exit 1
- fi
-fi
-
-PRIVATE_KEY=${WORKDIR}/uscan/PRIVATE_KEY.asc
-PUBLIC_KEY=${WORKDIR}/uscan/PUBLIC_KEY.asc
+. "${0%/*}/shunit2-helper-functions.sh"
GPGHOME=$(readlink -f ${WORKDIR}/uscan/gpg)
-rm -rf $GPGHOME
-mkdir -p $GPGHOME
-chmod 700 $GPGHOME
-PRIVATE_KEYRING=$GPGHOME/secring.gpg
-PUBLIC_KEYRING=$GPGHOME/pubring.gpg
-$GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
- --output $PRIVATE_KEYRING --dearmor $PRIVATE_KEY
+oneTimeSetUp () {
+ GPG=/usr/bin/gpg
+ if [ ! -x $GPG ];then
+ echo "$GPG missing"
+ GPG=/usr/bin/gpg2
+ if [ ! -x $GPG ];then
+ echo "$GPG missing"
+ exit 1
+ fi
+ fi
-$GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
- --output $PUBLIC_KEYRING --dearmor $PUBLIC_KEY
+ PRIVATE_KEY=${WORKDIR}/uscan/PRIVATE_KEY.asc
+ PUBLIC_KEY=${WORKDIR}/uscan/PUBLIC_KEY.asc
-$GPG --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
- --secret-keyring $PRIVATE_KEYRING --default-key 72543FAF \
- --list-keys --verbose
+ rm -rf $GPGHOME
+ mkdir -p $GPGHOME
+ chmod 700 $GPGHOME
+ PRIVATE_KEYRING=$GPGHOME/secring.gpg
+ PUBLIC_KEYRING=$GPGHOME/pubring.gpg
-. "${0%/*}/shunit2-helper-functions.sh"
+ $GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring
\
+ --output $PRIVATE_KEYRING --dearmor $PRIVATE_KEY
+
+ $GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring
\
+ --output $PUBLIC_KEYRING --dearmor $PUBLIC_KEY
-mkdir -p ${WORKDIR}/package_lifecycle/test/debian/source
-cat > ${WORKDIR}/package_lifecycle/test/debian/control <<-EOS
+ $GPG --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
+ --secret-keyring $PRIVATE_KEYRING --default-key 72543FAF \
+ --list-keys --verbose
+
+ mkdir -p ${WORKDIR}/package_lifecycle/test/debian/source
+ cat > ${WORKDIR}/package_lifecycle/test/debian/control <<-EOS
Source: test
Section: devel
Priority: optional
@@ -72,19 +74,21 @@ cat > ${WORKDIR}/package_lifecycle/test/debian/control
<<-EOS
Description: Short description
Longer description
EOS
-cp /usr/share/doc/debhelper/examples/rules.tiny
${WORKDIR}/package_lifecycle/test/debian/rules
-_DATE=$(LC_ALL=C date '+%a, %d %b %Y %T +0000')
-cat > ${WORKDIR}/package_lifecycle/test/debian/changelog <<-EOS
+ cp /usr/share/doc/debhelper/examples/rules.tiny
${WORKDIR}/package_lifecycle/test/debian/rules
+ _DATE=$(LC_ALL=C date '+%a, %d %b %Y %T +0000')
+ cat > ${WORKDIR}/package_lifecycle/test/debian/changelog <<-EOS
test (1.0-1) unstable; urgency=low
* Initial packaging
-- Testophilus Testownik <tes...@testity.org> ${_DATE}
EOS
-echo 9 > ${WORKDIR}/package_lifecycle/test/debian/compat
-echo '3.0 (quilt)' > ${WORKDIR}/package_lifecycle/test/debian/source/format
-touch ${WORKDIR}/package_lifecycle/test/CONTENTS
-cd ${WORKDIR}/package_lifecycle/ && tar cvf test_1.0.orig.tar --exclude debian
-- test/CONTENTS 2>&1 > /dev/null && xz -f test_1.0.orig.tar
+ echo 9 > ${WORKDIR}/package_lifecycle/test/debian/compat
+ echo '3.0 (quilt)' >
${WORKDIR}/package_lifecycle/test/debian/source/format
+ touch ${WORKDIR}/package_lifecycle/test/CONTENTS
+ cd ${WORKDIR}/package_lifecycle/ && tar cvf test_1.0.orig.tar --exclude
debian -- test/CONTENTS 2>&1 > /dev/null && xz -f test_1.0.orig.tar
+ cd ${WORKDIR}
+}
runCommandOutCmpFile() {
local param="$1"
@@ -326,7 +330,10 @@ EOS
cd ${WORKDIR}
}
+oneTimeTearDown () {
+ rm -rf ${WORKDIR}/package_lifecycle
+}
+
cd ${WORKDIR}
. shunit2
-rm -rf ${WORKDIR}/package_lifecycle
diff --git a/test/test_uscan_mangle b/test/test_uscan_mangle
index 073d041..893411a 100755
--- a/test/test_uscan_mangle
+++ b/test/test_uscan_mangle
@@ -40,6 +40,8 @@ DEBUGBASH=":"
#DEBUGBASH="bash -i"
#DEBUGBASH="ls -laR"
+GPGHOME=$(readlink -f $test_dir/uscan/gpg)
+
GPG=/usr/bin/gpg
if [ ! -x $GPG ];then
echo "$GPG missing"
@@ -52,23 +54,25 @@ fi
PRIVATE_KEY=$test_dir/uscan/PRIVATE_KEY.asc
PUBLIC_KEY=$test_dir/uscan/PUBLIC_KEY.asc
-
-GPGHOME=$(readlink -f $test_dir/uscan/gpg)
-rm -rf $GPGHOME
-mkdir -p $GPGHOME
-chmod 700 $GPGHOME
PRIVATE_KEYRING=$GPGHOME/secring.gpg
PUBLIC_KEYRING=$GPGHOME/pubring.gpg
-$GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
- --output $PRIVATE_KEYRING --dearmor $PRIVATE_KEY
-$GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
- --output $PUBLIC_KEYRING --dearmor $PUBLIC_KEY
+oneTimeSetUp () {
+
+ rm -rf $GPGHOME
+ mkdir -p $GPGHOME
+ chmod 700 $GPGHOME
+ $GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring
\
+ --output $PRIVATE_KEYRING --dearmor $PRIVATE_KEY
-$GPG --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
- --secret-keyring $PRIVATE_KEYRING --default-key 72543FAF \
- --list-keys --verbose
+ $GPG -v --homedir $GPGHOME --no-options -q --batch --no-default-keyring
\
+ --output $PUBLIC_KEYRING --dearmor $PUBLIC_KEY
+
+ $GPG --homedir $GPGHOME --no-options -q --batch --no-default-keyring \
+ --secret-keyring $PRIVATE_KEYRING --default-key 72543FAF \
+ --list-keys --verbose
+}
# Initial Debian revision value is distribution dependent
SUFFIX="1"
@@ -949,4 +953,9 @@ opts="component=baz,pgpsigurlmangle=s/$/.asc/" @@@url@@@
(?:.*)/baz@ANY_VERSION@
helperWatch siteWebNonNativeMUT
}
+oneTimeTearDown () {
+ rm -rf ${GPGHOME}
+}
+
+
. shunit2
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/collab-maint/devscripts.git
_______________________________________________
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
