diff --git a/pykat/testing/utils.py b/pykat/testing/utils.py index 007585ba12ee50b9204fb563f671f8835ec49a96..6b987d850781472f8dd6d72f82ebfd2b45a3eaeb 100644 --- a/pykat/testing/utils.py +++ b/pykat/testing/utils.py @@ -1,7 +1,7 @@ import subprocess as sub import os -GIT_BIN = "c:\\cygwin64\\bin\\git" +GIT_BIN = "/usr/bin/git" class RunException(Exception): def __init__(self, returncode, args, err, out): @@ -23,13 +23,13 @@ def git(args): print os.getcwd() - p = sub.Popen(cmd, stdout=sub.PIPE, stderr=sub.PIPE) + p = sub.Popen(cmd, stdout=sub.PIPE, stderr=sub.PIPE,shell=True) out, err = p.communicate() if p.returncode != 0: print "STDERR: " + err print "STDOUT: " + err - raise RunException(p.returncode, args, err, out) + raise RunException(p.poll(), args, err, out) return [out, err] diff --git a/pykat/testing/web_server.py b/pykat/testing/web_server.py index 2d57324e4843c8c4c342c9b58db892ae5e294f4f..ab091616485c44a7e5b7a687c71d93e45403511d 100644 --- a/pykat/testing/web_server.py +++ b/pykat/testing/web_server.py @@ -3,7 +3,7 @@ import sys from flask import Flask from pykat.testing import utils -def start(instance_path,port=5000, debug=False): +def start(instance_path,port=5000, debug=True, ip="0.0.0.0"): global app print "starting web server..." @@ -21,27 +21,28 @@ def start(instance_path,port=5000, debug=False): from pykat.testing.web import app if(app.instance_path!=instance_path): + print app.instance_path, instance_path raise Exception("Instance path of Flask app didn't match the requested value") # load up the actual interface code import pykat.testing.web.web_interface # need local copy of src - if not os.path.exists("./finesse_src"): + if not os.path.exists(os.path.join(app.instance_path,"finesse_src")): print "finesse src folder didn't exist, cloning now..." - utils.git("clone git://gitmaster.atlas.aei.uni-hannover.de/finesse/src.git finesse_src") + utils.git(["clone","git://gitmaster.atlas.aei.uni-hannover.de/finesse/src.git","finesse_src"]) else: os.chdir(os.path.join(app.instance_path,"finesse_src")) # get the latest version for logs etc. utils.git("pull") # need local copy of test - if not os.path.exists("./finesse_test"): + if not os.path.exists(os.path.join(app.instance_path,"finesse_test")): print "finesse test folder didn't exist, cloning now..." - utils.git("clone git://gitmaster.atlas.aei.uni-hannover.de/finesse/test.git finesse_test") + utils.git(["clone","git://gitmaster.atlas.aei.uni-hannover.de/finesse/test.git","finesse_test"]) app.secret_key = os.urandom(24) - app.run(debug=debug, port=int(port)) + app.run(debug=debug, port=int(port), host=ip) if __name__ == "__main__": n = len(sys.argv) @@ -70,4 +71,7 @@ start_test_server usage: port = 5000 start(instance_path, port=port) - \ No newline at end of file + + + +