mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tests to reflect the signed-binary-caches default change

Browse source
This commit is contained in:
Eelco Dolstra 2017-03-21 18:06:13 +01:00
parent e1e49c58e1
commit aa23bba27f
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/manual/command-ref/conf-file.xml
View file

@ -394,9 +394,10 @@ flag, e.g. <literal>--option gc-keep-outputs false</literal>.</para>
<varlistentry><term><literal>signed-binary-caches</literal></term> <varlistentry><term><literal>signed-binary-caches</literal></term>
<listitem><para>If set to <literal>*</literal>, Nix will only <listitem><para>If set to <literal>*</literal> (the default), Nix
download binaries if they are signed using one of the keys listed will only download binaries if they are signed using one of the
in <option>binary-cache-public-keys</option>.</para></listitem> keys listed in <option>binary-cache-public-keys</option>. Set to
the empty string to disable signature checking.</para></listitem>
</varlistentry> </varlistentry>

10
tests/binary-cache.sh
View file

@ -18,7 +18,7 @@ basicTests() {
nix-env --option binary-caches "file://$cacheDir" -f dependencies.nix -qas \* | grep -- "---" nix-env --option binary-caches "file://$cacheDir" -f dependencies.nix -qas \* | grep -- "---"
nix-store --option binary-caches "file://$cacheDir" -r $outPath nix-store --option binary-caches "file://$cacheDir" --option signed-binary-caches '' -r $outPath
[ -x $outPath/program ] [ -x $outPath/program ]
@ -34,7 +34,7 @@ basicTests() {
x=$(nix-env -f dependencies.nix -qas \* --prebuilt-only) x=$(nix-env -f dependencies.nix -qas \* --prebuilt-only)
[ -z "$x" ] [ -z "$x" ]
nix-store --option binary-caches "file://$cacheDir" -r $outPath nix-store --option binary-caches "file://$cacheDir" --option signed-binary-caches '' -r $outPath
nix-store --check-validity $outPath nix-store --check-validity $outPath
nix-store -qR $outPath | grep input-2 nix-store -qR $outPath | grep input-2
@ -63,7 +63,7 @@ mv $nar $nar.good
mkdir -p $TEST_ROOT/empty mkdir -p $TEST_ROOT/empty
nix-store --dump $TEST_ROOT/empty | xz > $nar nix-store --dump $TEST_ROOT/empty | xz > $nar
nix-build --option binary-caches "file://$cacheDir" dependencies.nix -o $TEST_ROOT/result 2>&1 | tee $TEST_ROOT/log nix-build --option binary-caches "file://$cacheDir" --option signed-binary-caches '' dependencies.nix -o $TEST_ROOT/result 2>&1 | tee $TEST_ROOT/log
grep -q "hash mismatch" $TEST_ROOT/log grep -q "hash mismatch" $TEST_ROOT/log
mv $nar.good $nar mv $nar.good $nar
@ -73,7 +73,7 @@ mv $nar.good $nar
clearStore clearStore
clearCacheCache clearCacheCache
if nix-store --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' -r $outPath; then if nix-store --option binary-caches "file://$cacheDir" -r $outPath; then
echo "unsigned binary cache incorrectly accepted" echo "unsigned binary cache incorrectly accepted"
exit 1 exit 1
fi fi
@ -99,7 +99,7 @@ clearStore
rm $(grep -l "StorePath:.*dependencies-input-2" $cacheDir/*.narinfo) rm $(grep -l "StorePath:.*dependencies-input-2" $cacheDir/*.narinfo)
nix-build --option binary-caches "file://$cacheDir" dependencies.nix -o $TEST_ROOT/result 2>&1 | tee $TEST_ROOT/log nix-build --option binary-caches "file://$cacheDir" --option signed-binary-caches '' dependencies.nix -o $TEST_ROOT/result 2>&1 | tee $TEST_ROOT/log
grep -q "fetching path" $TEST_ROOT/log grep -q "fetching path" $TEST_ROOT/log

4
tests/repair.sh
View file

@ -51,7 +51,7 @@ nix copy --recursive --to file://$cacheDir $path
chmod u+w $path2 chmod u+w $path2
rm -rf $path2 rm -rf $path2
nix-store --verify --check-contents --repair --option binary-caches "file://$cacheDir" nix-store --verify --check-contents --repair --option binary-caches "file://$cacheDir" --option signed-binary-caches ''
if [ "$(nix-hash $path2)" != "$hash" -o -e $path2/bad ]; then if [ "$(nix-hash $path2)" != "$hash" -o -e $path2/bad ]; then
echo "path not repaired properly" >&2 echo "path not repaired properly" >&2
@ -69,7 +69,7 @@ if nix-store --verify-path $path2; then
exit 1 exit 1
fi fi
nix-store --repair-path $path2 --option binary-caches "file://$cacheDir" nix-store --repair-path $path2 --option binary-caches "file://$cacheDir" --option signed-binary-caches ''
if [ "$(nix-hash $path2)" != "$hash" -o -e $path2/bad ]; then if [ "$(nix-hash $path2)" != "$hash" -o -e $path2/bad ]; then
echo "path not repaired properly" >&2 echo "path not repaired properly" >&2