From a1b18567fc2a3f5d70595e28308adc279fae4357 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 20 Sep 2018 20:04:57 -0400 Subject: test: db-import-pkg: Be stricter about checking the .db [ci-skip] --- test/cases/db-import-pkg.bats | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/cases/db-import-pkg.bats b/test/cases/db-import-pkg.bats index 6318805..eb30f20 100644 --- a/test/cases/db-import-pkg.bats +++ b/test/cases/db-import-pkg.bats @@ -226,6 +226,7 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.packages" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/x86_64/core.db.tar.gz" pkg-simple-c-1-1/desc __isLinkTo "$TMP/ftp/core/os/x86_64/pkg-simple-c-1-1-x86_64.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-simple-c-1-1-x86_64.pkg.tar.xz" __doesNotExist "$TMP"/ftp/{core/os/x86_64,pool/packages,sources/packages}/slavery-* } @@ -236,6 +237,7 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.archlinux32" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/i686/core.db.tar.gz" pkg-simple-c-1-1/desc __isLinkTo "$TMP/ftp/core/os/i686/pkg-simple-c-1-1-i686.pkg.tar.xz" "$TMP/ftp/pool/archlinux32/pkg-simple-c-1-1-i686.pkg.tar.xz" __doesNotExist "$TMP"/ftp/{core/os/i686,pool/archlinux32,sources/archlinux32}/slavery-* } @@ -246,6 +248,7 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.archlinuxarm" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/armv7h/core.db.tar.gz" pkg-simple-c-1-1/desc __isLinkTo "$TMP/ftp/core/os/armv7h/pkg-simple-c-1-1-armv7h.pkg.tar.xz" "$TMP/ftp/pool/alarm/pkg-simple-c-1-1-armv7h.pkg.tar.xz" __doesNotExist "$TMP"/ftp/{core/os/alarm,pool/alarm,sources/alarm}/slavery-* } @@ -255,6 +258,7 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.packages" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/x86_64/core.db.tar.gz" pkg-simple-c-1-1/desc __isLinkTo "$TMP/ftp/core/os/x86_64/pkg-simple-c-1-1-x86_64.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-simple-c-1-1-x86_64.pkg.tar.xz" } @@ -264,6 +268,7 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.packages" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/x86_64/core.db.tar.gz" pkg-simple-c-1-1/desc __isLinkTo "$TMP/ftp/core/os/x86_64/pkg-simple-c-1-1-x86_64.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-simple-c-1-1-x86_64.pkg.tar.xz" __updateImportedPackage pkg-simple-c @@ -271,6 +276,7 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.packages" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/x86_64/core.db.tar.gz" pkg-simple-c-1-2/desc __isLinkTo "$TMP/ftp/core/os/x86_64/pkg-simple-c-1-2-x86_64.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-simple-c-1-2-x86_64.pkg.tar.xz" } @@ -280,6 +286,7 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.packages" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/x86_64/core.db.tar.gz" pkg-simple-c-1-1/desc __isLinkTo "$TMP/ftp/core/os/x86_64/pkg-simple-c-1-1-x86_64.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-simple-c-1-1-x86_64.pkg.tar.xz" __doesNotExist "$TMP"/ftp/{core/os/x86_64,pool/packages,sources/packages}/slavery-* [[ "$(stat -c '%a' -- "$TMP/ftp/core/os/x86_64/core.db.tar.gz")" = 664 ]] @@ -291,6 +298,7 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.archlinux32" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/i686/core.db.tar.gz" pkg-simple-c-1-1/desc __isLinkTo "$TMP/ftp/core/os/i686/pkg-simple-c-1-1-i686.pkg.tar.xz" "$TMP/ftp/pool/archlinux32/pkg-simple-c-1-1-i686.pkg.tar.xz" __doesNotExist "$TMP"/ftp/{core/os/i686,pool/archlinux32,sources/archlinux32}/slavery-* stat -- "$TMP/ftp/core/os/i686/core.db.tar.gz" @@ -303,6 +311,7 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.archlinuxarm" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/armv7h/core.db.tar.gz" pkg-simple-c-1-1/desc __isLinkTo "$TMP/ftp/core/os/armv7h/pkg-simple-c-1-1-armv7h.pkg.tar.xz" "$TMP/ftp/pool/alarm/pkg-simple-c-1-1-armv7h.pkg.tar.xz" __doesNotExist "$TMP"/ftp/{core/os/armv7h,pool/alarm,sources/alarm}/slavery-* stat -- "$TMP/ftp/core/os/armv7h/core.db.tar.gz" @@ -318,6 +327,10 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.archlinux32" __db-import-pkg DBSCRIPTS_CONFIG="${TMP}/config.local.archlinuxarm" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/x86_64/core.db.tar.gz" pkg-any-a-1-1/desc + bsdtar xfO "$TMP/ftp/core/os/i686/core.db.tar.gz" pkg-any-a-1-1/desc + bsdtar xfO "$TMP/ftp/core/os/armv7h/core.db.tar.gz" pkg-any-a-1-1/desc + __isLinkTo "$TMP/ftp/core/os/x86_64/pkg-any-a-1-1-any.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-any-a-1-1-any.pkg.tar.xz" __isLinkTo "$TMP/ftp/core/os/i686/pkg-any-a-1-1-any.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-any-a-1-1-any.pkg.tar.xz" __isLinkTo "$TMP/ftp/core/os/armv7h/pkg-any-a-1-1-any.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-any-a-1-1-any.pkg.tar.xz" @@ -383,10 +396,12 @@ __doesNotExist() { __releaseImportedPackage pkg-any64 x86_64 "$TMP/rsyncd/archlinux/core/os/x86_64/core.db.tar.gz" "$TMP/rsyncd/archlinux/pool/packages" DBSCRIPTS_CONFIG="${TMP}/config.local.packages" __db-import-pkg __isLinkTo "$TMP/ftp/core/os/x86_64/pkg-any-2-1-any.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-any-2-1-any.pkg.tar.xz" + bsdtar xfO "$TMP/ftp/core/os/x86_64/core.db.tar.gz" pkg-any-2-1/desc __releaseImportedPackage pkg-any32 i686 "$TMP/rsyncd/archlinux32/i686/core/core.db.tar.gz" "$TMP/rsyncd/archlinux32/pool" DBSCRIPTS_CONFIG="${TMP}/config.local.archlinux32" __db-import-pkg __isLinkTo "$TMP/ftp/core/os/i686/pkg-any-1-1.2-any.pkg.tar.xz" "$TMP/ftp/pool/archlinux32/pkg-any-1-1.2-any.pkg.tar.xz" + bsdtar xfO "$TMP/ftp/core/os/i686/core.db.tar.gz" pkg-any-1-1.2/desc } @test "import respects INHERIT precedence" { @@ -397,6 +412,9 @@ __doesNotExist() { DBSCRIPTS_CONFIG="${TMP}/config.local.packages" __db-import-pkg DBSCRIPTS_CONFIG="${TMP}/config.local.archlinuxarm" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/x86_64/core.db.tar.gz" pkg-any-a-1-1/desc + bsdtar xfO "$TMP/ftp/core/os/armv7h/core.db.tar.gz" pkg-any-a-1-1/desc + __isLinkTo "$TMP/ftp/core/os/x86_64/pkg-any-a-1-1-any.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-any-a-1-1-any.pkg.tar.xz" __isLinkTo "$TMP/ftp/core/os/armv7h/pkg-any-a-1-1-any.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-any-a-1-1-any.pkg.tar.xz" } @@ -407,6 +425,7 @@ __doesNotExist() { touch "$TMP/stamp" DBSCRIPTS_CONFIG="${TMP}/config.local.packages" __db-import-pkg + bsdtar xfO "$TMP/ftp/core/os/x86_64/core.db.tar.gz" pkg-simple-c-1-1/desc __isLinkTo "$TMP/ftp/core/os/x86_64/pkg-simple-c-1-1-x86_64.pkg.tar.xz" "$TMP/ftp/pool/packages/pkg-simple-c-1-1-x86_64.pkg.tar.xz" [[ "$TMP/ftp/pool/packages/pkg-simple-c-1-1-x86_64.pkg.tar.xz" -nt "$TMP/stamp" ]] [[ "$TMP/ftp/lastupdate" -nt "$TMP/stamp" ]] -- cgit v1.2.2