Commit 24c51432 authored by Daniel Brown's avatar Daniel Brown
Browse files

removing more chdir

parent 0a19a809
...@@ -374,10 +374,10 @@ def finesse_get_test_progress(): ...@@ -374,10 +374,10 @@ def finesse_get_test_progress():
@app.route('/finesse/get_branches', methods=["POST"]) @app.route('/finesse/get_branches', methods=["POST"])
def finesse_get_branches(): def finesse_get_branches():
os.chdir(os.path.join(app.instance_path,"finesse_src")) SRC_PATH = os.path.join(app.instance_path,"finesse_src")
try: try:
[out,err] = utils.git("branch -a") [out,err] = utils.git(["branch","-a"],cwd = SRC_PATH)
except Exception as ex: except Exception as ex:
print "git branch error : " + str(ex) print "git branch error : " + str(ex)
...@@ -392,15 +392,15 @@ def finesse_get_branches(): ...@@ -392,15 +392,15 @@ def finesse_get_branches():
@app.route('/finesse/get_<count>_<branch>_logs', methods=['POST']) @app.route('/finesse/get_<count>_<branch>_logs', methods=['POST'])
def finesse_get_log(count,branch): def finesse_get_log(count,branch):
os.chdir(os.path.join(app.instance_path,"finesse_src"))
SRC_PATH = os.path.join(app.instance_path,"finesse_src")
try: try:
[out,err] = utils.git(["checkout", branch]) [out,err] = utils.git(["checkout", branch],cwd = SRC_PATH)
[out,err] = utils.git(["pull"]) [out,err] = utils.git(["pull"],cwd = SRC_PATH)
except Exception as ex: except Exception as ex:
print "git pull error : " + str(ex) print "git pull error : " + str(ex)
[out,err] = utils.git(["log","--max-count={0}".format(count),"--pretty=oneline"]) [out,err] = utils.git(["log","--max-count={0}".format(count),"--pretty=oneline"],cwd = SRC_PATH)
log_entries = out.split("\n") log_entries = out.split("\n")
...@@ -599,7 +599,7 @@ def setInterval(interval): ...@@ -599,7 +599,7 @@ def setInterval(interval):
@setInterval(600) @setInterval(600)
def checkLatestCommits(): def checkLatestCommits():
global latest_commit_id_tested global latest_commit_id_tested
out = utils.git(["--git-dir",SRC_GIT_PATH,"log", latest_commit_id_tested[:8] + "..HEAD",'--pretty=format:"%H"']) out = utils.git(["log", latest_commit_id_tested[:8] + "..HEAD",'--pretty=format:"%H"'], cwd=SRC_GIT_PATH)
print "Checking latest commits..." print "Checking latest commits..."
commits_not_tested = [] commits_not_tested = []
......
...@@ -32,14 +32,13 @@ def start(instance_path,port=5000, debug=True, ip="0.0.0.0", git_bin="/usr/bin/g ...@@ -32,14 +32,13 @@ def start(instance_path,port=5000, debug=True, ip="0.0.0.0", git_bin="/usr/bin/g
print "finesse src folder didn't exist, cloning now..." 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: else:
os.chdir(os.path.join(app.instance_path,"finesse_src"))
# get the latest version for logs etc. # get the latest version for logs etc.
utils.git("pull") utils.git("pull", cwd=os.path.join(app.instance_path,"finesse_src"))
# need local copy of test # need local copy of test
if not os.path.exists(os.path.join(app.instance_path,"finesse_test")): if not os.path.exists(os.path.join(app.instance_path,"finesse_test")):
print "finesse test folder didn't exist, cloning now..." 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"],cwd=os.path.join(app.instance_path,"finesse_src"))
# load up the actual interface code # load up the actual interface code
import pykat.testing.web.web_interface import pykat.testing.web.web_interface
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment