From 1f7b62f123fde15b89746b6b1f73c40a8e927499 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Mon, 18 Dec 2023 10:36:18 -0800
Subject: [PATCH] Use `nix daemon` in the test suite

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.
---
 tests/functional/build-remote-trustless-should-pass-1.sh | 2 +-
 tests/functional/common/vars-and-functions.sh.in         | 4 ++--
 tests/functional/nix-daemon-untrusting.sh                | 2 +-
 tests/functional/store-info.sh                           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/functional/build-remote-trustless-should-pass-1.sh b/tests/functional/build-remote-trustless-should-pass-1.sh
index 516bdf092..736e280e4 100644
--- a/tests/functional/build-remote-trustless-should-pass-1.sh
+++ b/tests/functional/build-remote-trustless-should-pass-1.sh
@@ -2,7 +2,7 @@ source common.sh
 
 # Remote trusts us
 file=build-hook.nix
-prog=nix-daemon
+prog='nix%20daemon'
 proto=ssh-ng
 
 source build-remote-trustless.sh
diff --git a/tests/functional/common/vars-and-functions.sh.in b/tests/functional/common/vars-and-functions.sh.in
index 848988af9..c25366481 100644
--- a/tests/functional/common/vars-and-functions.sh.in
+++ b/tests/functional/common/vars-and-functions.sh.in
@@ -95,7 +95,7 @@ startDaemon() {
     fi
     # Start the daemon, wait for the socket to appear.
     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=$!
     export _NIX_TEST_DAEMON_PID
     for ((i = 0; i < 300; i++)); do
@@ -148,7 +148,7 @@ fi
 isDaemonNewer () {
   [[ -n "${NIX_DAEMON_PACKAGE:-}" ]] || return 0
   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 ]]
 }
 
diff --git a/tests/functional/nix-daemon-untrusting.sh b/tests/functional/nix-daemon-untrusting.sh
index bcdb70989..c339b5833 100755
--- a/tests/functional/nix-daemon-untrusting.sh
+++ b/tests/functional/nix-daemon-untrusting.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec nix-daemon --force-untrusted "$@"
+exec nix daemon --force-untrusted "$@"
diff --git a/tests/functional/store-info.sh b/tests/functional/store-info.sh
index c002e50be..18a8131a9 100644
--- a/tests/functional/store-info.sh
+++ b/tests/functional/store-info.sh
@@ -6,7 +6,7 @@ STORE_INFO_JSON=$(nix store info --json)
 echo "$STORE_INFO" | grep "Store URL: ${NIX_REMOTE}"
 
 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_JSON" | jq -r ".version")" == "$DAEMON_VERSION" ]]
 fi