From: Pierre Schmitz <pie...@archlinux.de>
(cherry picked from commit ec7d4fdced1aac8116d68427a8606c9f27b06b41)
---
test/cases/create-filelists.bats | 1 -
test/cases/db-update.bats | 31 +++++++++++++++++++++++++++++++
test/cases/signed-packages.bats | 37 -------------------------------------
3 files changed, 31 insertions(+), 38 deletions(-)
delete mode 100755 test/cases/signed-packages.bats
diff --git a/test/cases/create-filelists.bats b/test/cases/create-filelists.bats
index a9cf223..b7fa015 100755
--- a/test/cases/create-filelists.bats
+++ b/test/cases/create-filelists.bats
@@ -67,7 +67,6 @@ load ../lib/common
done
}
-
@test "cleanup file lists" {
local pkgs=('pkg-simple-a' 'pkg-simple-b')
local pkgbase
diff --git a/test/cases/db-update.bats b/test/cases/db-update.bats
index 37dfbc9..f0bb85b 100755
--- a/test/cases/db-update.bats
+++ b/test/cases/db-update.bats
@@ -160,3 +160,34 @@ load ../lib/common
[ ! -e "${FTP_BASE}/unknown" ]
rm -rf "${STAGING}/unknown/"
}
+
+@test "add unsigned package fails" {
+ releasePackage extra 'pkg-simple-a' 'i686'
+ rm "${STAGING}"/extra/*.sig
+ ! db-update >/dev/null 2>&1
+
+ checkRemovedPackage extra pkg-simple-a-1-1-i686.pkg.tar.xz i686
+}
+
+@test "add invalid signed package fails" {
+ 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
+
+ checkRemovedPackage extra pkg-simple-a-1-1-i686.pkg.tar.xz i686
+}
+
+@test "add broken signature fails" {
+ 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
+
+ checkRemovedPackage extra pkg-simple-a-1-1-i686.pkg.tar.xz i686
+}
diff --git a/test/cases/signed-packages.bats b/test/cases/signed-packages.bats
deleted file mode 100755
index 9fb1626..0000000
--- a/test/cases/signed-packages.bats
+++ /dev/null
@@ -1,37 +0,0 @@
-load ../lib/common
-
-@test "add signed package" {
- releasePackage extra 'pkg-simple-a' 'i686'
- db-update
-}
-
-@test "add unsigned package fails" {
- releasePackage extra 'pkg-simple-a' 'i686'
- rm "${STAGING}"/extra/*.sig
- ! db-update >/dev/null 2>&1
-
- checkRemovedPackage extra pkg-simple-a-1-1-i686.pkg.tar.xz i686
-}
-
-@test "add invalid signed package fails" {
- 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
-
- checkRemovedPackage extra pkg-simple-a-1-1-i686.pkg.tar.xz i686
-}
-
-@test "add broken signature fails" {
- 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
-
- checkRemovedPackage extra pkg-simple-a-1-1-i686.pkg.tar.xz i686
-}
--
2.16.2
_______________________________________________
Dev mailing list
Dev@lists.parabola.nu
https://lists.parabola.nu/mailman/listinfo/dev
