From: Pierre Schmitz <pie...@archlinux.de> (cherry picked from commit e0ee502955948e980c711112cdb0c3eb249d0c7b) --- test/cases/db-move.bats | 6 +++--- test/cases/db-update.bats | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/test/cases/db-move.bats b/test/cases/db-move.bats index 4eea575..cdc89e3 100755 --- a/test/cases/db-move.bats +++ b/test/cases/db-move.bats @@ -15,7 +15,7 @@ load ../lib/common for arch in "${ARCH_BUILD[@]}"; do checkPackage extra "pkg-simple-a-1-1-${arch}.pkg.tar.xz" "${arch}" - checkRemovedPackage testing "pkg-simple-a-1-1-${arch}.pkg.tar.xz" "${arch}" + checkRemovedPackage testing pkg-simple-a "${arch}" checkPackage testing "pkg-simple-b-1-1-${arch}.pkg.tar.xz" "${arch}" done @@ -37,7 +37,7 @@ load ../lib/common for pkgbase in "${pkgs[@]}"; do for arch in "${ARCH_BUILD[@]}"; do checkPackage extra "${pkgbase}-1-1-${arch}.pkg.tar.xz" "${arch}" - checkRemovedPackage testing "${pkgbase}-1-1-${arch}.pkg.tar.xz" "${arch}" + checkRemovedPackage testing "${pkgbase}" "${arch}" done done } @@ -57,7 +57,7 @@ load ../lib/common for arch in "${ARCH_BUILD[@]}"; do checkPackage extra "pkg-simple-epoch-1:1-1-${arch}.pkg.tar.xz" "${arch}" - checkRemovedPackage testing "pkg-simple-epoch-1:1-1-${arch}.pkg.tar.xz" "${arch}" + checkRemovedPackage testing pkg-simple-epoch "${arch}" done } diff --git a/test/cases/db-update.bats b/test/cases/db-update.bats index 2fafcd8..3a2e543 100755 --- a/test/cases/db-update.bats +++ b/test/cases/db-update.bats @@ -148,7 +148,7 @@ load ../lib/common run db-update [ "$status" -ne 0 ] - checkRemovedPackage extra pkg-any-a-1-1-any.pkg.tar.xz any + checkRemovedPackageDB extra pkg-any-a any } @test "add invalid signed package fails" { @@ -161,7 +161,7 @@ load ../lib/common run db-update [ "$status" -ne 0 ] - checkRemovedPackage extra pkg-any-a-1-1-any.pkg.tar.xz any + checkRemovedPackageDB extra pkg-any-a any } @test "add broken signature fails" { @@ -173,7 +173,7 @@ load ../lib/common run db-update [ "$status" -ne 0 ] - checkRemovedPackage extra pkg-any-a-1-1-any.pkg.tar.xz any + checkRemovedPackageDB extra pkg-any-a any } @test "add package with inconsistent version fails" { @@ -186,7 +186,7 @@ load ../lib/common run db-update [ "$status" -ne 0 ] - checkRemovedPackage extra 'pkg-any-a-2-1-any.pkg.tar.xz' 'any' + checkRemovedPackageDB extra 'pkg-any-a' 'any' } @test "add package with inconsistent name fails" { @@ -199,7 +199,7 @@ load ../lib/common run db-update [ "$status" -ne 0 ] - checkRemovedPackage extra 'foo-pkg-any-a-1-1-any.pkg.tar.xz' 'any' + checkRemovedPackage extra 'foo-pkg-any-a' 'any' } @test "add package with inconsistent pkgbuild fails" { @@ -210,7 +210,7 @@ load ../lib/common run db-update [ "$status" -ne 0 ] - checkRemovedPackage extra 'pkg-any-a-1-1-any.pkg.tar.xz' 'any' + checkRemovedPackageDB extra 'pkg-any-a' 'any' } @test "add package with insufficient permissions fails" { @@ -222,8 +222,8 @@ load ../lib/common [ "$status" -ne 0 ] chmod +xwr ${FTP_BASE}/core/os/i686 - checkRemovedPackage core 'pkg-any-a-1-1-any.pkg.tar.xz' 'any' - checkRemovedPackage extra 'pkg-any-b-1-1-any.pkg.tar.xz' 'any' + checkRemovedPackageDB core 'pkg-any-a' 'any' + checkRemovedPackageDB extra 'pkg-any-b' 'any' } @test "package has to be a regular file" { @@ -240,6 +240,6 @@ load ../lib/common run db-update [ "$status" -ne 0 ] for arch in "${ARCH_BUILD[@]}"; do - checkRemovedPackage extra "pkg-simple-a-1-1-${arch}.pkg.tar.xz" $arch + checkRemovedPackageDB extra "pkg-simple-a" $arch done } -- 2.16.2 _______________________________________________ Dev mailing list Dev@lists.parabola.nu https://lists.parabola.nu/mailman/listinfo/dev