diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2023-02-01 17:11:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-01 17:11:34 +0100 |
| commit | 7a09bfbcb631b7dfb56d4c04687bc0f6e3e39f75 (patch) | |
| tree | 9bcee7988cda87ce0235638bd3074f812e7d2e4c /tests | |
| parent | 518da6c6a30881bd0e767a84c8193a198eeed230 (diff) | |
| parent | 4757b3f04e0a4568ab40ab86b9251945874a5662 (diff) | |
Merge pull request #7723 from yorickvP/nix-store-ping-json
nix store ping: add --json flag
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/store-ping.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/store-ping.sh b/tests/store-ping.sh index f9427cf0a..9846c7d3d 100644 --- a/tests/store-ping.sh +++ b/tests/store-ping.sh @@ -1,13 +1,17 @@ source common.sh STORE_INFO=$(nix store ping 2>&1) +STORE_INFO_JSON=$(nix store ping --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) echo "$STORE_INFO" | grep "Version: $DAEMON_VERSION" + [[ "$(echo "$STORE_INFO_JSON" | jq -r ".version")" == "$DAEMON_VERSION" ]] fi expect 127 NIX_REMOTE=unix:$PWD/store nix store ping || \ fail "nix store ping on a non-existent store should fail" + +[[ "$(echo "$STORE_INFO_JSON" | jq -r ".url")" == "${NIX_REMOTE:-local}" ]] |