From 5f6e0fc1046ff896f66623bf8b8611ad4a0555cc Mon Sep 17 00:00:00 2001 From: vishalseshagiri Date: Wed, 2 Aug 2017 20:10:20 +0530 Subject: [PATCH] amended commit Former-commit-id: fa2b54c67c79b910a97768c959f13d77b7fa3dc6 --- .travis.yml | 3 ++- test.py | 35 ++++++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4bc8b815..bf89a043 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,9 @@ install: - docker exec -i frappe bash -c "bench --site site1.local install-app erpnext" - docker exec -i -u root frappe bash -c "echo 127.0.0.1 site1.local >> /etc/hosts" - sudo su -c 'echo 127.0.0.1 site1.local >> /etc/hosts' - - docker exec -id frappe bash -c "bench start" + - docker exec -it frappe bash -c "bench start" - pip install requests + - pip install time script: - docker-compose ps | grep -i frappe diff --git a/test.py b/test.py index d2383276..d21e41dd 100644 --- a/test.py +++ b/test.py @@ -1,10 +1,31 @@ -import subprocess,requests,time +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) + +def print_out(val,delay): + while 1: + time.sleep(delay) + if val == 1: + result,error = process.communicate() + print(result) + elif val == 2: + try: + r = requests.get("http://site1.local:8000") + print(r) + except requests.exceptions.ConnectionError as e: + print(e) + +_thread.start_new_thread(print_out, (1, 1)) +#result, error = process.communicate() +_thread.start_new_thread(print_out, (2, 1)) time.sleep(45) -try: - r = requests.get("site1.local:8000") - assert ' Login ' in r.content, "Login page failed to load" -except Exception as e: - traceback.print_exc(e) - sys.exit(3) +os.killpg(os.getpgid(process.pid), signal.SIGTERM) # Kill bench start + +print(r.content) + +assert ' Login ' in r.content, "Login page failed to load"