From 5f7527421fdfa860243d712ae62967399ed541bd Mon Sep 17 00:00:00 2001 From: Jakub Onderka Date: Sat, 27 Jan 2024 12:05:38 +0100 Subject: [PATCH] chg: [test] Do not show progressbar for curl commands --- .github/workflows/main.yml | 2 +- tests/curl_tests_GH.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d04954bc..8ed3157c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -212,7 +212,7 @@ jobs: run: | sudo systemctl status apache2 --no-pager -l sudo apache2ctl -S - curl http://${HOST} + curl -sS http://${HOST} - name: Check if dependencies working as expected run: | diff --git a/tests/curl_tests_GH.sh b/tests/curl_tests_GH.sh index 146b51eba..5c1015369 100755 --- a/tests/curl_tests_GH.sh +++ b/tests/curl_tests_GH.sh @@ -7,13 +7,13 @@ AUTH="$1" HOST="$2" # Check if user is logged -curl -i -H "Authorization: $AUTH" -H "Accept: application/json" -X GET http://${HOST}/servers/getVersion -curl -i -H "Accept: application/json" -H "content-type: application/json" -H "Authorization: $AUTH" --data "@event.json" -X POST http://${HOST}/events > /dev/null -curl -H "Authorization: $AUTH" -X GET http://${HOST}/events/csv/download/1/ignore:1 | sed -e 's/^M//g' | cut -d, -f2 --complement | sort > 1.csv +curl -sS -i -H "Authorization: $AUTH" -H "Accept: application/json" -X GET http://${HOST}/servers/getVersion +curl -sS -i -H "Accept: application/json" -H "content-type: application/json" -H "Authorization: $AUTH" --data "@event.json" -X POST http://${HOST}/events > /dev/null +curl -sS -H "Authorization: $AUTH" -X GET http://${HOST}/events/csv/download/1/ignore:1 | sed -e 's/^M//g' | cut -d, -f2 --complement | sort > 1.csv cat 1.csv cut -d, -f2 --complement event.csv | sort > compare.csv diff compare.csv 1.csv # Test alert email generating sudo -u www-data ../app/Console/cake Event testEventNotificationEmail 1 1 > /dev/null # Delete created event -curl -i -H "Accept: application/json" -H "content-type: application/json" -H "Authorization: $AUTH" -X POST http://${HOST}/events/delete/1 +curl -sS -i -H "Accept: application/json" -H "content-type: application/json" -H "Authorization: $AUTH" -X POST http://${HOST}/events/delete/1