diff options
| author | regnat <rg@regnat.ovh> | 2020-06-08 10:01:14 +0200 |
|---|---|---|
| committer | regnat <rg@regnat.ovh> | 2020-06-08 10:01:14 +0200 |
| commit | f6ac888d3e1897f37a8accb9c46ebdf4fc2ca204 (patch) | |
| tree | d04048515d95f0877feff2cbb161667569f6f38f | |
| parent | d558fb98f6f8ce32e5c08a36d798441f1b941ba8 (diff) | |
Actually test nix-env with a remote store
The `remote-store` test loads the `user-env` one to test nix-env when
using the daemon, but actually does it incorrectly because every test
starts (in `common.sh`) by resetting the value of `NIX_REMOTE`, meaning
that the `user-env` test will never use the daemon.
Fix this by setting `NIX_REMOTE_` before sourcing `user-env.sh` in the
`remote-store` test, so that `NIX_REMOTE` is correctly set inside the
test
| -rw-r--r-- | tests/remote-store.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/remote-store.sh b/tests/remote-store.sh index 77437658e..4cc73465a 100644 --- a/tests/remote-store.sh +++ b/tests/remote-store.sh @@ -4,7 +4,7 @@ clearStore startDaemon -storeCleared=1 $SHELL ./user-envs.sh +storeCleared=1 NIX_REMOTE_=$NIX_REMOTE $SHELL ./user-envs.sh nix-store --dump-db > $TEST_ROOT/d1 NIX_REMOTE= nix-store --dump-db > $TEST_ROOT/d2 |