lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #1587 from copumpkin/fix-tests

Browse source 
Fix tests
This commit is contained in:
Eelco Dolstra 2017-10-03 11:06:03 +02:00 committed by GitHub
parent f3e0d46821 3139cad9cd
commit fce24b7d6c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/binary-cache.sh
View file

@ -6,7 +6,7 @@ clearCache
# Create the binary cache. # Create the binary cache.
outPath=$(nix-build dependencies.nix --no-out-link) outPath=$(nix-build dependencies.nix --no-out-link)
nix copy --recursive --to file://$cacheDir $outPath nix copy --to file://$cacheDir $outPath
basicTests() { basicTests() {
@ -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)) res=($(nix-store --generate-binary-cache-key foo.nixos.org-1 $TEST_ROOT/sk3 $TEST_ROOT/pk3))
otherKey="$(cat $TEST_ROOT/pk3)" otherKey="$(cat $TEST_ROOT/pk3)"
nix copy --recursive --to file://$cacheDir?secret-key=$TEST_ROOT/sk1 $outPath nix copy --to file://$cacheDir?secret-key=$TEST_ROOT/sk1 $outPath
# Downloading should fail if we don't provide a key. # Downloading should fail if we don't provide a key.

2
tests/nix-channel.sh
View file

@ -15,7 +15,7 @@ nix-channel --remove xyzzy
# Create a channel. # Create a channel.
rm -rf $TEST_ROOT/foo rm -rf $TEST_ROOT/foo
mkdir -p $TEST_ROOT/foo mkdir -p $TEST_ROOT/foo
nix copy --recursive --to file://$TEST_ROOT/foo?compression="bzip2" $(nix-store -r $(nix-instantiate dependencies.nix)) nix copy --to file://$TEST_ROOT/foo?compression="bzip2" $(nix-store -r $(nix-instantiate dependencies.nix))
rm -rf $TEST_ROOT/nixexprs rm -rf $TEST_ROOT/nixexprs
mkdir -p $TEST_ROOT/nixexprs mkdir -p $TEST_ROOT/nixexprs
cp config.nix dependencies.nix dependencies.builder*.sh $TEST_ROOT/nixexprs/ cp config.nix dependencies.nix dependencies.builder*.sh $TEST_ROOT/nixexprs/

2
tests/repair.sh
View file

@ -46,7 +46,7 @@ fi
# --verify can fix it. # --verify can fix it.
clearCache clearCache
nix copy --recursive --to file://$cacheDir $path nix copy --to file://$cacheDir $path
chmod u+w $path2 chmod u+w $path2
rm -rf $path2 rm -rf $path2