X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Fintegration%2Fsimple_query.sh;h=22bd815a95f4733ef09c52f44b2996b9ca13de13;hb=5ef6f70a8eae3e4ee1a839e10b2d2037382463e0;hp=232d3e192ef5b42203ee1b7e5cbf4331f92a7506;hpb=ba731a056789ac030a09acc2ff15fe5d740b8215;p=sysdb.git

diff --git a/t/integration/simple_query.sh b/t/integration/simple_query.sh
index 232d3e1..22bd815 100755
--- a/t/integration/simple_query.sh
+++ b/t/integration/simple_query.sh
@@ -39,21 +39,21 @@ PluginDir "$PLUGIN_DIR"
 Interval 2
 
 LoadBackend mock_plugin
-<Backend "test::integration::mock">
+<Backend "mock_plugin">
 </Backend>
 EOF
 
-$SYSDBD -D -C "$SYSDBD_CONF" &
-sysdbd_pid=$!
+run_sysdbd -D -C "$SYSDBD_CONF"
 
 wait_for_sysdbd
 sleep 3
 
-output="$( $SYSDB -H "$SOCKET_FILE" -c INVALID )" && exit 1
+# On parse errors, expect a non-zero exit code.
+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"' \
@@ -61,7 +61,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"' \
@@ -71,11 +71,12 @@ 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" -c "FETCH 'does.not.exist'" )" \
+# When requesting information for unknown hosts, expect a non-zero exit code.
+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"' \
@@ -84,7 +85,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"' \
@@ -93,7 +94,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
@@ -101,7 +102,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"' \
@@ -110,6 +111,10 @@ echo "$output" | grep -F 'some.host.name' && exit 1
 echo "$output" | grep -F 'other.host.name' && exit 1
 echo "$output" | grep -F 'localhost' && exit 1
 
-kill $sysdbd_pid
-wait $sysdbd_pid
+# When querying hosts that don't exist, expect a zero exit code.
+output="$( run_sysdb -H "$SOCKET_FILE" \
+	-c "LOOKUP hosts WHERE attribute.invalid = 'none'" )"
+echo $output | grep -E '^\[\]$'
+
+stop_sysdbd