diff options
| author | Linus Heckemann <git@sphalerite.org> | 2018-02-13T11·05+0000 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2018-02-13T14·26+0000 |
| commit | 78ac3eb4ebc04e180abeb01bcc6f9d4103522eab (patch) | |
| tree | 240d03638868440126931fecd8e6886b6e7a3bf5 /tests | |
| parent | c5cc57e96220cd3ed915875f3b1eeb2ba1f98a30 (diff) | |
Fix #1762
nix-store --export, nix-store --dump, and nix dump-path would previously
fail silently if writing the data out failed, because
a) FdSink::write ignored exceptions, and
b) the commands relied on FdSink's destructor, which ignores
exceptions, to flush the data out.
This could cause rather opaque issues with installing nixos, because
nix-store --export would happily proceed even if it couldn't write its
data out (e.g. if nix-store --import on the other side of the pipe
failed).
This commit adds tests that expose these issues in the nix-store
commands, and fixes them for all three.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/export.sh | 5 | ||||
| -rw-r--r-- | tests/nar-access.sh | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/export.sh b/tests/export.sh index ec7560f19728..2238539bcca9 100644 --- a/tests/export.sh +++ b/tests/export.sh @@ -8,6 +8,11 @@ nix-store --export $outPath > $TEST_ROOT/exp nix-store --export $(nix-store -qR $outPath) > $TEST_ROOT/exp_all +if nix-store --export $outPath >/dev/full ; then + echo "exporting to a bad file descriptor should fail" + exit 1 +fi + clearStore diff --git a/tests/nar-access.sh b/tests/nar-access.sh index bd849cbfab1d..553d6ca89d7d 100644 --- a/tests/nar-access.sh +++ b/tests/nar-access.sh @@ -36,3 +36,9 @@ diff -u baz.cat-nar $storePath/foo/baz # Test missing files. nix ls-store --json -R $storePath/xyzzy 2>&1 | grep 'does not exist in NAR' nix ls-store $storePath/xyzzy 2>&1 | grep 'does not exist' + +# Test failure to dump. +if nix-store --dump $storePath >/dev/full ; then + echo "dumping to /dev/full should fail" + exit -1 +fi |