kleph/beer
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

default-hour #14

Merged
kleph merged 5 commits from default-hour into master 2020-04-09 00:06:59 +02:00
Conversation 0 Commits 5 Files changed 2 +14 -2
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ff0bca9421 - Show all commits

4
beer/beer.py
View file

@ -18,9 +18,9 @@ def index(hours=None, minutes=None):
if not hours: if not hours:
hours = 17 hours = 17
if hours and not minutes: if hours and not minutes:
minutes = 30
else:
minutes = 0 minutes = 0
else:
minutes = 30
data = render_template('beer.html', hours=hours, minutes=minutes) data = render_template('beer.html', hours=hours, minutes=minutes)
return data return data

12
staging_tests.sh
View file

@ -5,6 +5,18 @@ else
fi fi
echo "testing URL: ${TEST_URL}" echo "testing URL: ${TEST_URL}"
while :
do
status_code=$(curl -o /dev/null -s -w '%{http_code}' ${TEST_URL})
echo "status code: ${status_code}"
[[ ${status_code} -eq 200 ]] && break
[[ ${i} -gt 5 ]] && exit 1
echo "service not ready or in error"
sleep 5
i=$(( i+1 ))
done
CURL_OPTS='-s' CURL_OPTS='-s'
# default # default
curl ${CURL_OPTS} ${TEST_URL} | grep -q 'setHours( 17, 30);' curl ${CURL_OPTS} ${TEST_URL} | grep -q 'setHours( 17, 30);'