diff --git a/tests/integration/01_simple.sh b/tests/integration/01_simple.sh index ad0bb6b1..3ee600d6 100755 --- a/tests/integration/01_simple.sh +++ b/tests/integration/01_simple.sh @@ -85,7 +85,6 @@ testInstallAgain() { assertEquals 'install test successfully' "$installst" "0" assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.gz' ]" } testCleanup() { diff --git a/tests/integration/01_simple_docker.sh b/tests/integration/01_simple_docker.sh index 87d7125f..18c8a54f 100755 --- a/tests/integration/01_simple_docker.sh +++ b/tests/integration/01_simple_docker.sh @@ -120,8 +120,6 @@ testInstallAgain() { assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" assertTrue 'package Z installed' "[ -e '$tmpdir/testrootfs/z' ]" - assertTrue 'package Z in cache' "[ -e '$tmpdir/testrootfs/packages/z-test-1.0+2.package.tar.zst' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.zst' ]" } testCleanup() { diff --git a/tests/integration/01_simple_downloadonly.sh b/tests/integration/01_simple_downloadonly.sh index b4eb11a5..9085ca84 100755 --- a/tests/integration/01_simple_downloadonly.sh +++ b/tests/integration/01_simple_downloadonly.sh @@ -60,7 +60,7 @@ testDownloadOnly() { installst=$? assertEquals 'install test successfully' "$installst" "0" assertTrue 'package not installed' "[ ! -e '$tmpdir/testrootfs/c' ]" - assertTrue 'cache populated' "[ -e '$tmpdir/testrootfs/var/cache/luet/packages/c-test-1.0.package.tar.gz' ]" + assertTrue 'cache populated' "[ -e '$tmpdir/testrootfs/var/cache/luet/packages/README' ]" luet install -y --config $tmpdir/luet.yaml test/c > /dev/null installst=$? @@ -72,7 +72,7 @@ testCleanup() { luet cleanup --config $tmpdir/luet.yaml > /dev/null installst=$? assertEquals 'install test successfully' "$installst" "0" - assertTrue 'package installed' "[ ! -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.gz' ]" + assertTrue 'cache dropped' "[ ! -e '$tmpdir/testrootfs/var/cache/luet/packages/README' ]" } # Load shUnit2. diff --git a/tests/integration/01_simple_gzip.sh b/tests/integration/01_simple_gzip.sh index 21ccf210..62093a91 100755 --- a/tests/integration/01_simple_gzip.sh +++ b/tests/integration/01_simple_gzip.sh @@ -90,14 +90,12 @@ testInstallAgain() { assertEquals 'install test successfully' "$installst" "0" assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.gz' ]" } testCleanup() { luet cleanup --config $tmpdir/luet.yaml installst=$? assertEquals 'install test successfully' "$installst" "0" - assertTrue 'package installed' "[ ! -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.gz' ]" } # Load shUnit2. diff --git a/tests/integration/01_simple_http.sh b/tests/integration/01_simple_http.sh index ffe6853d..a3e681a4 100755 --- a/tests/integration/01_simple_http.sh +++ b/tests/integration/01_simple_http.sh @@ -90,7 +90,6 @@ testInstallAgain() { assertEquals 'install test successfully' "$installst" "0" assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.zst' ]" } testCleanup() { diff --git a/tests/integration/01_simple_meta_gzip.sh b/tests/integration/01_simple_meta_gzip.sh index 646df967..9b70e8be 100755 --- a/tests/integration/01_simple_meta_gzip.sh +++ b/tests/integration/01_simple_meta_gzip.sh @@ -93,7 +93,6 @@ testInstallAgain() { assertEquals 'install test successfully' "$installst" "0" assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.gz' ]" } testCleanup() { diff --git a/tests/integration/01_simple_zstd.sh b/tests/integration/01_simple_zstd.sh index 9737ce15..27067bb3 100755 --- a/tests/integration/01_simple_zstd.sh +++ b/tests/integration/01_simple_zstd.sh @@ -93,7 +93,6 @@ testInstallAgain() { assertEquals 'install test successfully' "$installst" "0" assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.zst' ]" } testCleanup() { diff --git a/tests/integration/02_create_repo_from_config.sh b/tests/integration/02_create_repo_from_config.sh index f792fc61..3a6591e1 100755 --- a/tests/integration/02_create_repo_from_config.sh +++ b/tests/integration/02_create_repo_from_config.sh @@ -83,14 +83,13 @@ testInstallAgain() { assertEquals 'install test successfully' "$installst" "0" assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.gz' ]" } testCleanup() { luet cleanup --config $tmpdir/luet.yaml installst=$? assertEquals 'install test successfully' "$installst" "0" - assertTrue 'package installed' "[ ! -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.gz' ]" + assertTrue 'package installed' "[ ! -e '$tmpdir/testrootfs/packages/README' ]" } # Load shUnit2. diff --git a/tests/integration/28_nobuildtreedocker.sh b/tests/integration/28_nobuildtreedocker.sh index 502b5c94..32c8946e 100755 --- a/tests/integration/28_nobuildtreedocker.sh +++ b/tests/integration/28_nobuildtreedocker.sh @@ -142,7 +142,7 @@ testInstallAgain() { assertEquals 'install test successfully' "$installst" "0" assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.zst' ]" + assertTrue 'cache initialized' "[ -e '$tmpdir/testrootfs/packages/README' ]" } testCleanup() { @@ -151,6 +151,7 @@ testCleanup() { luet cleanup --config $tmpdir/luet-client.yaml installst=$? assertEquals 'cleanup test successfully' "$installst" "0" + assertTrue 'cache removed' "[ ! -e '$tmpdir/testrootfs/packages/README' ]" } # Load shUnit2. diff --git a/tests/integration/29_nobuildtreeinheritvalues.sh b/tests/integration/29_nobuildtreeinheritvalues.sh index 622c5f7b..76d2e7b7 100755 --- a/tests/integration/29_nobuildtreeinheritvalues.sh +++ b/tests/integration/29_nobuildtreeinheritvalues.sh @@ -147,7 +147,6 @@ testInstallAgain() { assertEquals 'install test successfully' "$installst" "0" assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.zst' ]" } testCleanup() { diff --git a/tests/integration/29_nobuildtreeinheritvalues_noignored.sh b/tests/integration/29_nobuildtreeinheritvalues_noignored.sh index a19d6c30..5f9b87d0 100755 --- a/tests/integration/29_nobuildtreeinheritvalues_noignored.sh +++ b/tests/integration/29_nobuildtreeinheritvalues_noignored.sh @@ -146,7 +146,6 @@ testInstallAgain() { assertEquals 'install test successfully' "$installst" "0" assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.zst' ]" } testCleanup() { diff --git a/tests/integration/29_nobuildtreeinheritvalues_norebuild.sh b/tests/integration/29_nobuildtreeinheritvalues_norebuild.sh index 0099f3ad..2ebad780 100755 --- a/tests/integration/29_nobuildtreeinheritvalues_norebuild.sh +++ b/tests/integration/29_nobuildtreeinheritvalues_norebuild.sh @@ -154,7 +154,6 @@ testInstallAgain() { assertEquals 'install test successfully' "$installst" "0" assertNotContains 'contains warning' "$output" 'No packages to install' assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" - assertTrue 'package in cache' "[ -e '$tmpdir/testrootfs/packages/c-test-1.0.package.tar.zst' ]" } testCleanup() {