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

Use nix daemon in the test suite

Browse source 
As part of the CLI stabilization effort, the last remaining checkbox (at
the moment) for `nix daemon` is that it "needs testing". This implements
the proposal of using `nix daemon` in place of `nix-daemon` in the test
suite.
This commit is contained in:
Cole Helbling 2023-12-18 10:36:18 -08:00
parent 5d5b25f2e3
commit 1f7b62f123
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/functional/build-remote-trustless-should-pass-1.sh
View file

@ -2,7 +2,7 @@ source common.sh
# Remote trusts us # Remote trusts us
file=build-hook.nix file=build-hook.nix
prog=nix-daemon prog='nix%20daemon'
proto=ssh-ng proto=ssh-ng
source build-remote-trustless.sh source build-remote-trustless.sh

4
tests/functional/common/vars-and-functions.sh.in
View file

@ -95,7 +95,7 @@ startDaemon() {
fi fi
# Start the daemon, wait for the socket to appear. # Start the daemon, wait for the socket to appear.
rm -f $NIX_DAEMON_SOCKET_PATH rm -f $NIX_DAEMON_SOCKET_PATH
PATH=$DAEMON_PATH nix-daemon & PATH=$DAEMON_PATH nix --extra-experimental-features 'nix-command' daemon &
_NIX_TEST_DAEMON_PID=$! _NIX_TEST_DAEMON_PID=$!
export _NIX_TEST_DAEMON_PID export _NIX_TEST_DAEMON_PID
for ((i = 0; i < 300; i++)); do for ((i = 0; i < 300; i++)); do
@ -148,7 +148,7 @@ fi
isDaemonNewer () { isDaemonNewer () {
[[ -n "${NIX_DAEMON_PACKAGE:-}" ]] || return 0 [[ -n "${NIX_DAEMON_PACKAGE:-}" ]] || return 0
local requiredVersion="$1" local requiredVersion="$1"
local daemonVersion=$($NIX_DAEMON_PACKAGE/bin/nix-daemon --version | cut -d' ' -f3) local daemonVersion=$($NIX_DAEMON_PACKAGE/bin/nix daemon --version | cut -d' ' -f3)
[[ $(nix eval --expr "builtins.compareVersions ''$daemonVersion'' ''$requiredVersion''") -ge 0 ]] [[ $(nix eval --expr "builtins.compareVersions ''$daemonVersion'' ''$requiredVersion''") -ge 0 ]]
} }

2
tests/functional/nix-daemon-untrusting.sh
View file

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
exec nix-daemon --force-untrusted "$@" exec nix daemon --force-untrusted "$@"

2
tests/functional/store-info.sh
View file

@ -6,7 +6,7 @@ STORE_INFO_JSON=$(nix store info --json)
echo "$STORE_INFO" | grep "Store URL: ${NIX_REMOTE}" echo "$STORE_INFO" | grep "Store URL: ${NIX_REMOTE}"
if [[ -v NIX_DAEMON_PACKAGE ]] && isDaemonNewer "2.7.0pre20220126"; then if [[ -v NIX_DAEMON_PACKAGE ]] && isDaemonNewer "2.7.0pre20220126"; then
DAEMON_VERSION=$($NIX_DAEMON_PACKAGE/bin/nix-daemon --version | cut -d' ' -f3) DAEMON_VERSION=$($NIX_DAEMON_PACKAGE/bin/nix daemon --version | cut -d' ' -f3)
echo "$STORE_INFO" | grep "Version: $DAEMON_VERSION" echo "$STORE_INFO" | grep "Version: $DAEMON_VERSION"
[[ "$(echo "$STORE_INFO_JSON" | jq -r ".version")" == "$DAEMON_VERSION" ]] [[ "$(echo "$STORE_INFO_JSON" | jq -r ".version")" == "$DAEMON_VERSION" ]]
fi fi