X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Fintegration%2Fsimple_query.sh;h=3be00655392eae11d377cf25acd0172d617dd480;hb=d8077043c91f5a519f20afa97b5c8720ac703f21;hp=e7118974fd95b4cbfe4b65800ff19c1017dfbc91;hpb=7e9fee5e2cb1e191f91b5fae2381ccddabb6c418;p=sysdb.git

diff --git a/t/integration/simple_query.sh b/t/integration/simple_query.sh
index e711897..3be0065 100755
--- a/t/integration/simple_query.sh
+++ b/t/integration/simple_query.sh
@@ -43,18 +43,18 @@ LoadBackend mock_plugin
 </Backend>
 EOF
 
-$SYSDBD -D -C "$SYSDBD_CONF" &
+run_sysdbd -D -C "$SYSDBD_CONF" &
 sysdbd_pid=$!
 
 wait_for_sysdbd
 sleep 3
 
 # On parse errors, expect a non-zero exit code.
-output="$( $SYSDB -H "$SOCKET_FILE" -c INVALID )" && exit 1
+output="$( run_sysdb -H "$SOCKET_FILE" -c INVALID )" && exit 1
 echo "$output" | grep "Failed to parse query 'INVALID'"
 echo "$output" | grep "parse error: syntax error"
 
-output="$( $SYSDB -H "$SOCKET_FILE" -c LIST )"
+output="$( run_sysdb -H "$SOCKET_FILE" -c LIST )"
 echo "$output" \
 	| grep -F '"host1.example.com"' \
 	| grep -F '"host2.example.com"' \
@@ -62,7 +62,7 @@ echo "$output" \
 	| grep -F '"other.host.name"' \
 	| grep -F '"some.host.name"'
 
-output="$( $SYSDB -H "$SOCKET_FILE" -c "FETCH 'host1.example.com'" )"
+output="$( run_sysdb -H "$SOCKET_FILE" -c "FETCH 'host1.example.com'" )"
 echo "$output" \
 	| grep -F '"host1.example.com"' \
 	| grep -F '"mock service"' \
@@ -73,11 +73,11 @@ echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'some.host.name' && exit 1
 
 # When requesting information for unknown hosts, expect a non-zero exit code.
-output="$( $SYSDB -H "$SOCKET_FILE" -c "FETCH 'does.not.exist'" )" \
+output="$( run_sysdb -H "$SOCKET_FILE" -c "FETCH 'does.not.exist'" )" \
 	&& exit 1
 echo "$output" | grep -F 'not found'
 
-output="$( $SYSDB -H "$SOCKET_FILE" \
+output="$( run_sysdb -H "$SOCKET_FILE" \
 	-c "LOOKUP hosts WHERE attribute.architecture = 'x42'" )"
 echo "$output" \
 	| grep -F '"host1.example.com"' \
@@ -86,7 +86,7 @@ echo "$output" | grep -F 'localhost' && exit 1
 echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'some.host.name' && exit 1
 
-output="$( $SYSDB -H "$SOCKET_FILE" \
+output="$( run_sysdb -H "$SOCKET_FILE" \
 	-c "LOOKUP hosts WHERE attribute.name != 'architecture'" )"
 echo "$output" \
 	| grep -F '"some.host.name"' \
@@ -95,7 +95,7 @@ echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'host1.example.com' && exit 1
 echo "$output" | grep -F 'host2.example.com' && exit 1
 
-output="$( $SYSDB -H "$SOCKET_FILE" \
+output="$( run_sysdb -H "$SOCKET_FILE" \
 	-c "LOOKUP hosts WHERE service.name = 'sysdbd'" )"
 echo "$output" | grep -F '"localhost"'
 echo "$output" | grep -F 'some.host.name' && exit 1
@@ -103,7 +103,7 @@ echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'host1.example.com' && exit 1
 echo "$output" | grep -F 'host2.example.com' && exit 1
 
-output="$( $SYSDB -H "$SOCKET_FILE" \
+output="$( run_sysdb -H "$SOCKET_FILE" \
 	-c "LOOKUP hosts WHERE host.name =~ 'example.com'" )"
 echo "$output" \
 	| grep -F '"host1.example.com"' \
@@ -113,7 +113,7 @@ echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'localhost' && exit 1
 
 # When querying hosts that don't exist, expect a zero exit code.
-output="$( $SYSDB -H "$SOCKET_FILE" \
+output="$( run_sysdb -H "$SOCKET_FILE" \
 	-c "LOOKUP hosts WHERE attribute.invalid = 'none'" )"
 echo $output | grep -E '^\[\]$'