aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/test
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2022-04-11 03:48:03 +0200
committerEgor Tensin <Egor.Tensin@gmail.com>2022-04-11 03:48:03 +0200
commit997196078d03e3ed7171368a4734ca16d6394f63 (patch)
tree8904f7f7d3d2b266b08bc55af0a865cef509fd99 /test
parentdebian: 1.2-2 (diff)
parentREADME: update (diff)
downloadlinux-status-997196078d03e3ed7171368a4734ca16d6394f63.tar.gz
linux-status-997196078d03e3ed7171368a4734ca16d6394f63.zip
Merge tag 'v2.0' into debian
Diffstat (limited to '')
-rwxr-xr-xtest/test.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/test.sh b/test/test.sh
index 77a15e2..8597a24 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -27,7 +27,7 @@ dump() {
run_server() {
dump "Starting up server..."
- "$script_dir/../server.py" --port 18101 &
+ "$script_dir/../src/server.py" --port "$server_port" &
server_pid="$!"
dump "Its PID is $server_pid"
sleep 5
@@ -108,6 +108,9 @@ curl_check_keyword() {
if ! grep --fixed-strings --quiet -- "$keyword" "$curl_output_file"; then
dump "The following pattern hasn't been found:"
dump "$keyword"
+ dump "The output was:"
+ cat -- "$curl_output_file"
+ return 1
fi
done
}
@@ -169,7 +172,7 @@ run_cgi_test() {
local query_string="what=$what"
dump "Running CGI test for query string: $query_string"
- QUERY_STRING="$query_string" "$script_dir/../app.py" > "$curl_output_file"
+ QUERY_STRING="$query_string" "$script_dir/../src/app.py" > "$curl_output_file"
cgi_check_header