Merge branch 'cleanup' into master-merge

Conflicts:
	config
	cron-jobs/sourceballs
	db-functions
	db-move
	db-remove
	db-update

1 files changed, 24 insertions, 1 deletions

diff --git a/test/test.d/signed-packages.sh b/test/test.d/signed-packages.sh
index 5d6f4ff..03566ef 100755
--- a/test/test.d/signed-packages.sh
+++ b/test/test.d/signed-packages.sh
@@ -3,11 +3,34 @@
 curdir=$(readlink -e $(dirname $0))
 . "${curdir}/../lib/common.inc"
 
+testAddSignedPackage() {
+	releasePackage extra 'pkg-simple-a' 'i686'
+	../db-update || fail "db-update failed!"
+}
+
 testAddUnsignedPackage() {
 	releasePackage extra 'pkg-simple-a' 'i686'
-	# remove any signature
 	rm "${STAGING}"/extra/*.sig
 	../db-update >/dev/null 2>&1 && fail "db-update should fail when a signature is missing!"
 }
 
+testAddInvalidSignedPackage() {
+	local p
+	releasePackage extra 'pkg-simple-a' 'i686'
+	for p in "${STAGING}"/extra/*${PKGEXT}; do
+		unxz $p
+		xz -0 ${p%%.xz}
+	done
+	../db-update >/dev/null 2>&1 && fail "db-update should fail when a signature is invalid!"
+}
+
+testAddBrokenSignature() {
+	local s
+	releasePackage extra 'pkg-simple-a' 'i686'
+	for s in "${STAGING}"/extra/*.sig; do
+		echo 0 > $s
+	done
+	../db-update >/dev/null 2>&1 && fail "db-update should fail when a signature is broken!"
+}
+
 . "${curdir}/../lib/shunit2"