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

Merge pull request 'default-hour' (#14) from default-hour into master
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse source
This commit is contained in:
kleph 2020-04-09 00:06:57 +02:00
commit e86991fe75
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
beer/beer.py
View file

@ -15,10 +15,13 @@ app.url_map.strict_slashes = False
@app.route('/<int(min=0, max=23):hours>/<int(min=0, max=59):minutes>') @app.route('/<int(min=0, max=23):hours>/<int(min=0, max=59):minutes>')
def index(hours=None, minutes=None): def index(hours=None, minutes=None):
""" main and only app """ """ main and only app """
if not hours:
hours = 17 if hours:
if not minutes: if not minutes:
minutes = 0 minutes = 0
else:
hours = 17
minutes = 30
data = render_template('beer.html', hours=hours, minutes=minutes) data = render_template('beer.html', hours=hours, minutes=minutes)
return data return data

14
staging_tests.sh
View file

@ -5,9 +5,21 @@ 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, 0);' curl ${CURL_OPTS} ${TEST_URL} | grep -q 'setHours( 17, 30);'
[ $? -ne 0 ] && echo "Failed with default" && exit 1 [ $? -ne 0 ] && echo "Failed with default" && exit 1
# set 1 parameter # set 1 parameter