max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-12-03 19:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review

Browse source 
Co-authored-by: John Ericson <git@JohnEricson.me>
This commit is contained in:
Dylan Green 2023-05-17 14:56:48 -05:00 committed by Ben Radford
parent 9290af763a
commit 60c0149721
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/gc.cc
View file

@ -114,6 +114,7 @@ void LocalStore::addTempRoot(const StorePath & path)
debug("Read-only store doesn't support creating lock files for temp roots, but nothing can be deleted anyways."); debug("Read-only store doesn't support creating lock files for temp roots, but nothing can be deleted anyways.");
return; return;
} }
createTempRootsFile(); createTempRootsFile();
/* Open/create the global GC lock file. */ /* Open/create the global GC lock file. */

19
tests/read-only-store.sh
View file

@ -2,19 +2,26 @@ source common.sh
clearStore clearStore
happy () {
# We can do a read-only query just fine with a read-only store
nix --store local?read-only=true path-info $dummyPath
# We can "write" an already-present store-path a read-only store, because no IO is actually required
nix-store --store local?read-only=true --add dummy
}
## Testing read-only mode without forcing the underlying store to actually be read-only ## Testing read-only mode without forcing the underlying store to actually be read-only
# Make sure the command fails when the store doesn't already have a database # Make sure the command fails when the store doesn't already have a database
expectStderr 1 nix-store --store local?read-only=true --add dummy | grepQuiet "unable to create database while in read-only mode" expectStderr 1 nix-store --store local?read-only=true --add dummy | grepQuiet "unable to create database while in read-only mode"
# Make sure the store actually has a current-database # Make sure the store actually has a current-database, with at least one store object
nix-store --add dummy dummyPath=$(nix-store --add dummy)
# Try again and make sure we fail when adding a item not already in the store # Try again and make sure we fail when adding a item not already in the store
expectStderr 1 nix-store --store local?read-only=true --add eval.nix | grepQuiet "attempt to write a readonly database" expectStderr 1 nix-store --store local?read-only=true --add eval.nix | grepQuiet "attempt to write a readonly database"
# Make sure we can get an already-present store-path in the database # Test a few operations that should work with the read-only store in its current state
nix-store --store local?read-only=true --add dummy happy
## Testing read-only mode with an underlying store that is actually read-only ## Testing read-only mode with an underlying store that is actually read-only
@ -27,5 +34,5 @@ chmod -R -w $TEST_ROOT/var
expectStderr 1 nix-store --add eval.nix | grepQuiet "error: opening lock file '$(readlink -e $TEST_ROOT)/var/nix/db/big-lock'" expectStderr 1 nix-store --add eval.nix | grepQuiet "error: opening lock file '$(readlink -e $TEST_ROOT)/var/nix/db/big-lock'"
expectStderr 1 nix-store --store local?read-only=true --add eval.nix | grepQuiet "Permission denied" expectStderr 1 nix-store --store local?read-only=true --add eval.nix | grepQuiet "Permission denied"
# Should succeed # Test the same operations from before should again succeed
nix-store --store local?read-only=true --add dummy happy