diff --git a/.travis.yml b/.travis.yml index 68a4cf45..87f5edd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,3 +27,4 @@ script: - docker-compose ps | grep -i redis-socketio - docker-compose ps | grep -i mariadb - python3 test.py + - docker-compose stop diff --git a/test.py b/test.py index d21e41dd..02d92423 100644 --- a/test.py +++ b/test.py @@ -1,9 +1,9 @@ import subprocess, requests, datetime, _thread, time, os, signal start_time = datetime.datetime.now().time() -r = None -e = None bench_start = 'docker exec -i frappe bash -c "bench start"' -process = subprocess.Popen(bench_start, shell=True) +process = subprocess.Popen(bench_start, stdout=subprocess.PIPE , shell=True) + +r = None def print_out(val,delay): while 1: @@ -24,8 +24,7 @@ _thread.start_new_thread(print_out, (2, 1)) time.sleep(45) -os.killpg(os.getpgid(process.pid), signal.SIGTERM) # Kill bench start +process.kill() -print(r.content) - -assert ' Login ' in r.content, "Login page failed to load" +assert ' Login ' in str(r.content) +#os.killpg(os.getpgid(process.pid), signal.SIGTERM) # Kill bench start