summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2010-08-08 11:29:16 +0200
committerPierre Schmitz <pierre@archlinux.de>2010-08-08 11:29:16 +0200
commitcbe9204ce41a81086c7498360769a66cfe48ce34 (patch)
tree30655c0a13b5ba4b8f655e17fa90983e8dce57d7
parentc117d9048ae591401a79037222da7bf7bda85705 (diff)
downloaddbscripts-cbe9204ce41a81086c7498360769a66cfe48ce34.tar.gz
dbscripts-cbe9204ce41a81086c7498360769a66cfe48ce34.tar.xz
Fix test and add some more checks
-rwxr-xr-xtest/runTest9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/runTest b/test/runTest
index b24b7ea..5bbea05 100755
--- a/test/runTest
+++ b/test/runTest
@@ -239,6 +239,7 @@ testCleanupSimplePackages() {
for arch in ${arches[@]}; do
local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
+ checkRemovedPackage extra 'pkg-simple-a' ${arch}
[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg1}" ] && fail "packages/arch/${arch}/${pkg1} found"
[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
@@ -261,6 +262,7 @@ testCleanupAnyPackages() {
../cron-jobs/ftpdir-cleanup >/dev/null
local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
+ checkRemovedAnyPackage extra 'pkg-any-a'
[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg1}" ] && fail "packages/arch/${arch}/${pkg1} found"
[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
@@ -283,16 +285,15 @@ testCleanupSplitPackages() {
../db-update extra
- for pkgbase in ${pkgs[@]}; do
- for arch in ${arches[@]}; do
- ../db-remove pkg-split-a extra ${arch}
- done
+ for arch in ${arches[@]}; do
+ ../db-remove ${pkgs[0]} extra ${arch}
done
../cron-jobs/ftpdir-cleanup >/dev/null
for arch in ${arches[@]}; do
for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}.pkg.tar.*; do
+ checkRemovedPackage extra ${pkgs[0]} ${arch}
[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg}" ] && fail "packages/arch/${arch}/${pkg} found"
[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg}" ] && fail "${repo}/os/${arch}/${pkg} found"
done