diff options
| author | Shea Levy <shea@shealevy.com> | 2016-08-10 11:13:11 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-08-10 11:13:11 -0400 |
| commit | 6e51af80231b2a35ba3f5edffa7e235b239955a0 (patch) | |
| tree | b85e8f8f0257c2415e603eba86448f4ff24c918a /tests/binary-cache.sh | |
| parent | a6eed133c5a3602037bc48675ca783185cca5454 (diff) | |
Nuke nix-push.
Rarely used, nix copy replaces it.
Diffstat (limited to 'tests/binary-cache.sh')
| -rw-r--r-- | tests/binary-cache.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh index 96cab6ad4..4ce428f64 100644 --- a/tests/binary-cache.sh +++ b/tests/binary-cache.sh @@ -6,7 +6,7 @@ clearCache # Create the binary cache. outPath=$(nix-build dependencies.nix --no-out-link) -nix-push --dest $cacheDir $outPath +nix copy --recursive --to file://$cacheDir $outPath basicTests() { @@ -58,7 +58,7 @@ unset _NIX_FORCE_HTTP_BINARY_CACHE_STORE # Test whether Nix notices if the NAR doesn't match the hash in the NAR info. clearStore -nar=$(ls $cacheDir/*.nar.xz | head -n1) +nar=$(ls $cacheDir/nar/*.nar.xz | head -n1) mv $nar $nar.good mkdir -p $TEST_ROOT/empty nix-store --dump $TEST_ROOT/empty | xz > $nar @@ -117,7 +117,7 @@ badKey="$(cat $TEST_ROOT/pk2)" res=($(nix-store --generate-binary-cache-key foo.nixos.org-1 $TEST_ROOT/sk3 $TEST_ROOT/pk3)) otherKey="$(cat $TEST_ROOT/pk3)" -nix-push --dest $cacheDir --key-file $TEST_ROOT/sk1 $outPath +nix copy --recursive --to file://$cacheDir?secret-key=$TEST_ROOT/sk1 $outPath # Downloading should fail if we don't provide a key. |