diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-11-20T16·29+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-11-20T16·32+0100 |
| commit | 7a2b64e55c7d57707f4d1ed54ee21bf69d0d0d16 (patch) | |
| tree | 26b4270cdbbd180c0253e50310211ac29a4b1637 /tests | |
| parent | ea94a87493df0a60cadba291e31bbe7c6847c0c5 (diff) | |
binary-cache-public-keys -> trusted-public-keys
The name had become a misnomer since it's not only for substitution from binary caches, but when adding/copying any (non-content-addressed) path to a store.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/binary-cache.sh | 8 | ||||
| -rw-r--r-- | tests/signing.sh | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh index 2a044d2edc56..f7c0b2f78916 100644 --- a/tests/binary-cache.sh +++ b/tests/binary-cache.sh @@ -131,11 +131,11 @@ clearCacheCache clearStore clearCacheCache -(! nix-store -r $outPath --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' --option binary-cache-public-keys "$badKey") +(! nix-store -r $outPath --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' --option trusted-public-keys "$badKey") # It should succeed if we provide the correct key. -nix-store -r $outPath --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' --option binary-cache-public-keys "$otherKey $publicKey" +nix-store -r $outPath --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' --option trusted-public-keys "$otherKey $publicKey" # It should fail if we corrupt the .narinfo. @@ -152,10 +152,10 @@ done clearCacheCache -(! nix-store -r $outPath --option binary-caches "file://$cacheDir2" --option signed-binary-caches '*' --option binary-cache-public-keys "$publicKey") +(! nix-store -r $outPath --option binary-caches "file://$cacheDir2" --option signed-binary-caches '*' --option trusted-public-keys "$publicKey") # If we provide a bad and a good binary cache, it should succeed. -nix-store -r $outPath --option binary-caches "file://$cacheDir2 file://$cacheDir" --option signed-binary-caches '*' --option binary-cache-public-keys "$publicKey" +nix-store -r $outPath --option binary-caches "file://$cacheDir2 file://$cacheDir" --option signed-binary-caches '*' --option trusted-public-keys "$publicKey" fi # HAVE_LIBSODIUM diff --git a/tests/signing.sh b/tests/signing.sh index bef27ac7a58e..39aaa1e765bb 100644 --- a/tests/signing.sh +++ b/tests/signing.sh @@ -22,13 +22,13 @@ nix verify -r $outPath expect 2 nix verify -r $outPath --sigs-needed 1 -nix verify -r $outPath --sigs-needed 1 --binary-cache-public-keys $pk1 +nix verify -r $outPath --sigs-needed 1 --trusted-public-keys $pk1 -expect 2 nix verify -r $outPath --sigs-needed 2 --binary-cache-public-keys $pk1 +expect 2 nix verify -r $outPath --sigs-needed 2 --trusted-public-keys $pk1 -nix verify -r $outPath --sigs-needed 2 --binary-cache-public-keys "$pk1 $pk2" +nix verify -r $outPath --sigs-needed 2 --trusted-public-keys "$pk1 $pk2" -nix verify --all --sigs-needed 2 --binary-cache-public-keys "$pk1 $pk2" +nix verify --all --sigs-needed 2 --trusted-public-keys "$pk1 $pk2" # Build something unsigned. outPath2=$(nix-build simple.nix --no-out-link) @@ -45,12 +45,12 @@ nix verify -r $outPath2 expect 2 nix verify -r $outPath2 --sigs-needed 1 -expect 2 nix verify -r $outPath2 --sigs-needed 1 --binary-cache-public-keys $pk1 +expect 2 nix verify -r $outPath2 --sigs-needed 1 --trusted-public-keys $pk1 # Test "nix sign-paths". nix sign-paths --key-file $TEST_ROOT/sk1 $outPath2 -nix verify -r $outPath2 --sigs-needed 1 --binary-cache-public-keys $pk1 +nix verify -r $outPath2 --sigs-needed 1 --trusted-public-keys $pk1 # Copy to a binary cache. nix copy --to file://$cacheDir $outPath2 |