[devscripts] 02/03: test_package_lifecycle: Add handling for buildinfo signing

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 1a3304ab820c3f56dbef25dbcc674135417a83b3
Author: James McCoy <jamessan at debian.org>
Date:   Sun Feb 26 22:00:23 2017 -0500

    test_package_lifecycle: Add handling for buildinfo signing
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 test/test_package_lifecycle | 48 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle
index dad823e..7aefeae 100755
--- a/test/test_package_lifecycle
+++ b/test/test_package_lifecycle
@@ -146,12 +146,30 @@ test_debuild() {
 	 dpkg-source --after-build test
 	dpkg-buildpackage: full upload (original source is included)
 	Now signing changes and any dsc files...
-	 signfile test_1.0-1.dsc uscan test key (no secret) <none at debian.org>
+EOS
+  if which dpkg-genbuildinfo >/dev/null 2>&1; then
+    cat >> ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
+	 signfile dsc test_1.0-1.dsc uscan test key (no secret) <none at debian.org>
+	
+	 fixup_buildinfo test_1.0-1.dsc test_1.0-1_${_ARCH}.buildinfo
+	 signfile buildinfo test_1.0-1_${_ARCH}.buildinfo uscan test key (no secret) <none at debian.org>
+	
+	 fixup_changes dsc test_1.0-1.dsc test_1.0-1_${_ARCH}.changes
+	 fixup_changes buildinfo test_1.0-1_${_ARCH}.buildinfo test_1.0-1_${_ARCH}.changes
+	 signfile changes test_1.0-1_${_ARCH}.changes uscan test key (no secret) <none at debian.org>
+	
+	Successfully signed dsc, buildinfo, changes files
+EOS
+  else
+    cat >> ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
+	 signfile dsc test_1.0-1.dsc uscan test key (no secret) <none at debian.org>
 	
-	 signfile test_1.0-1_${_ARCH}.changes uscan test key (no secret) <none at debian.org>
+	 fixup_changes dsc test_1.0-1.dsc test_1.0-1_${_ARCH}.changes
+	 signfile changes test_1.0-1_${_ARCH}.changes uscan test key (no secret) <none at debian.org>
 	
-	Successfully signed dsc and changes files
+	Successfully signed dsc, changes files
 EOS
+  fi
   runCommandOutCmpFile "-k'uscan test key (no secret) <none at debian.org>'" "${WORKDIR}/package_lifecycle/debuild.txt" "" 0
   cd ${WORKDIR}
 }
@@ -272,12 +290,30 @@ test_debuild2() {
 	 dpkg-source --after-build test
 	dpkg-buildpackage: binary and diff upload (original source NOT included)
 	Now signing changes and any dsc files...
-	 signfile test_1.0-2.dsc uscan test key (no secret) <none at debian.org>
+EOS
+  if which dpkg-genbuildinfo >/dev/null 2>&1; then
+    cat >> ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
+	 signfile dsc test_1.0-2.dsc uscan test key (no secret) <none at debian.org>
+	
+	 fixup_buildinfo test_1.0-2.dsc test_1.0-2_${_ARCH}.buildinfo
+	 signfile buildinfo test_1.0-2_${_ARCH}.buildinfo uscan test key (no secret) <none at debian.org>
+	
+	 fixup_changes dsc test_1.0-2.dsc test_1.0-2_${_ARCH}.changes
+	 fixup_changes buildinfo test_1.0-2_${_ARCH}.buildinfo test_1.0-2_${_ARCH}.changes
+	 signfile changes test_1.0-2_${_ARCH}.changes uscan test key (no secret) <none at debian.org>
+	
+	Successfully signed dsc, buildinfo, changes files
+EOS
+  else
+    cat >> ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
+	 signfile dsc test_1.0-2.dsc uscan test key (no secret) <none at debian.org>
 	
-	 signfile test_1.0-2_${_ARCH}.changes uscan test key (no secret) <none at debian.org>
+	 fixup_changes dsc test_1.0-2.dsc test_1.0-2_${_ARCH}.changes
+	 signfile changes test_1.0-2_${_ARCH}.changes uscan test key (no secret) <none at debian.org>
 	
-	Successfully signed dsc and changes files
+	Successfully signed dsc, changes files
 EOS
+  fi
   runCommandOutCmpFile "-k'uscan test key (no secret) <none at debian.org>'" "${WORKDIR}/package_lifecycle/debuild.txt" "" 0
   cd ${WORKDIR}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git