Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Commit b240ece

Browse files
committed
setup tests for CI
1 parent 11d81fb commit b240ece

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ENV RSYSLOG_DESTINATION=127.0.0.1 \
2222
STATS_AUTH="stats:stats" \
2323
SSL_BIND_OPTIONS=no-sslv3 \
2424
SSL_BIND_CIPHERS="ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DHE-DSS-AES128-SHA:DES-CBC3-SHA" \
25-
HEALTH_CHECK="check"
25+
HEALTH_CHECK="check inter 2000 rise 2 fall 3"
2626

2727
EXPOSE 80 443 1936
2828
ENTRYPOINT ["tini", "--"]

hooks/test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
docker run -v $(pwd):/app --privileged tutum/dind bash -c 'eval "wrapdocker > /dev/null 2>&1 &" && apt-get update && apt-get install -y curl python-pip python-dev && cd app && ./test.sh'

test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
set -e
44

55
echo ======================== Unit Test ==========================
6-
python setup.py install
6+
pip install -r requirements.txt
77
pip install -r test-requirements.txt
8+
python setup.py install
89
nosetests -v --with-coverage --cover-package haproxy
910

1011
if [ "$(uname -s)" != "Darwin" ]; then

tests/test_legacy_links.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ cleanup
4343
echo
4444

4545
echo "=> Building haproxy image"
46-
docker build -t haproxy .
46+
docker tag this haproxy || docker build -t haproxy .
4747
echo
4848

4949
echo "=> Creating certificates"

0 commit comments

Comments
 (0)