mirror of
https://github.com/NixOS/nix.git
synced 2025-11-09 12:06:01 +01:00
Merge pull request #5997 from NixOS/test-nix-store-ping
Fix the `store ping` test
This commit is contained in:
commit
1fe3bfdeaf
1 changed files with 3 additions and 2 deletions
|
|
@ -4,8 +4,9 @@ STORE_INFO=$(nix store ping 2>&1)
|
||||||
|
|
||||||
echo "$STORE_INFO" | grep "Store URL: ${NIX_REMOTE}"
|
echo "$STORE_INFO" | grep "Store URL: ${NIX_REMOTE}"
|
||||||
|
|
||||||
if isDaemonNewer "2.7pre20220126"; then
|
if [[ -v NIX_DAEMON_PACKAGE ]] && isDaemonNewer "2.7.0pre20220126"; then
|
||||||
echo "$STORE_INFO" | grep "Version: $($NIX_DAEMON_PACKAGE/bin/nix-daemon --version)"
|
DAEMON_VERSION=$($NIX_DAEMON_PACKAGE/bin/nix-daemon --version | cut -d' ' -f3)
|
||||||
|
echo "$STORE_INFO" | grep "Version: $DAEMON_VERSION"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
expect 127 NIX_REMOTE=unix:$PWD/store nix store ping || \
|
expect 127 NIX_REMOTE=unix:$PWD/store nix store ping || \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue