From 7a2b64e55c7d57707f4d1ed54ee21bf69d0d0d16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Nov 2017 17:29:54 +0100 Subject: 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. --- tests/signing.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/signing.sh') 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 -- cgit 1.4.1