ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2024-12-22 14:12:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

REL-0.9 Bullet proof travis checks

Browse Source
This commit is contained in:
cytopia 2017-05-26 08:36:16 +02:00
parent 0c5efeca3b
commit 442db787d7
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.tests/.lib.sh
View File

@ -332,7 +332,7 @@ devilbox_start() {
_max="90" _max="90"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
for i in $(seq 1 "${_max}"); do for i in $(seq 1 "${_max}"); do
if [ "$( curl --connect-timeout 1 --max-time 1 -s -o /dev/null -w '%{http_code}' http://localhost/index.php )" = "200" ]; then if [ "$( curl --connect-timeout 1 --max-time 1 -s -o /dev/null -w '%{http_code}' http://127.0.0.1/index.php )" = "200" ]; then
break; break;
fi fi
sleep 1 sleep 1
@ -348,7 +348,7 @@ devilbox_start() {
devilbox_print_actual_settings() { devilbox_print_actual_settings() {
VERSIONS="$( curl -q http://localhost/index.php 2>/dev/null | \ VERSIONS="$( curl -q http://127.0.0.1/index.php 2>/dev/null | \
grep -E 'circles' | \ grep -E 'circles' | \
grep -oE '<strong.*strong>.*\(.*\)' | \ grep -oE '<strong.*strong>.*\(.*\)' | \
sed 's/<strong>//g' | \ sed 's/<strong>//g' | \

10
.tests/test_single.sh
View File

@ -122,19 +122,19 @@ print_h1 "Testing"
print_h2 "docker-compose" print_h2 "docker-compose"
if ! devilbox_test_compose; then if ! devilbox_test_compose; then
devilbox_print_errors "http://localhost/index.php" devilbox_print_errors "http://127.0.0.1/index.php"
exit 1 exit 1
fi fi
print_h2 "Testing 'dvlbox-ok': index.php" print_h2 "Testing 'dvlbox-ok': index.php"
if ! devilbox_test_url "http://localhost/index.php" "dvlbox-ok" "20"; then if ! devilbox_test_url "http://127.0.0.1/index.php" "dvlbox-ok" "20"; then
devilbox_print_errors "http://localhost/index.php" devilbox_print_errors "http://127.0.0.1/index.php"
exit 1 exit 1
fi fi
print_h2 "Testing 'dvlbox-err': index.php" print_h2 "Testing 'dvlbox-err': index.php"
if ! devilbox_test_url "http://localhost/index.php" "dvlbox-err" "0"; then if ! devilbox_test_url "http://127.0.0.1/index.php" "dvlbox-err" "0"; then
devilbox_print_errors "http://localhost/index.php" devilbox_print_errors "http://127.0.0.1/index.php"
exit 1 exit 1
fi fi

7
.travis.yml
View File

@ -172,13 +172,12 @@ matrix:
### ###
before_install: before_install:
# Get newer docker version # Get newer docker version
- sudo apt-get update - max=20; i=0; while [ $i -lt $max ]; do if sudo apt-get update; then break; else i=$((i+1)); fi done
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine - max=20; i=0; while [ $i -lt $max ]; do if sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine; then break; else i=$((i+1)); fi done
# Get newer docker-compose version # Get newer docker-compose version
- sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` > docker-compose - curl -L https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose - chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin - sudo mv -f docker-compose /usr/local/bin
### ###