Skip to content
Snippets Groups Projects
Commit 8b10254d authored by Daniel Brown's avatar Daniel Brown
Browse files

enabled commit checking every 10 mins

parent c81f81ff
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
pykat/testing/web/templates/finesse_kat_history.html 0 → 100644
+ 43
− 0
View file @ 8b10254d
<html>
<head>
<!--<link rel="stylesheet" type="text/css" href="/css/style.css"/>-->
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/css/jquery.dataTables.css">
</head>
<body>
<div>
<h1>FINESSE Test - {{kat}} history</h1>
<table id="tblHistory">
<thead>
<td>Test ID</td>
<td>Commit ID</td>
<td>Commit Date</td>
<td>Max rel Diff</td>
<td>Run time [s]</td>
</thead>
{% for item in data%}
<tr>
<td>{{item[0]}}</td>
<td>{{item[1]}}</td>
<td>{{item[2]}}</td>
<td>{{item[3]}}</td>
<td>{{item[4]}}</td>
</tr>
{% endfor %}
</table>
</div>
</body>
<script type="text/JavaScript" src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
<script type="text/JavaScript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
<script type="text/javascript" charset="utf8" src="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/jquery.dataTables.min.js"></script>
<script type="text/JavaScript">
$(document).ready(function(){
gtable = $('#tblHistory').dataTable();
});
</script>
</html>
\ No newline at end of file
pykat/testing/web/templates/finesse_test_diff.html 0 → 100644
+ 1
− 0
View file @ 8b10254d
{{content}}
\ No newline at end of file
pykat/testing/web/web_interface.py
+ 32
− 14
View file @ 8b10254d
...@@ -17,16 +17,18 @@ from CodernityDB.database_thread_safe import ThreadSafeDatabase ...@@ -17,16 +17,18 @@ from CodernityDB.database_thread_safe import ThreadSafeDatabase
from CodernityDB.database import RecordNotFound from CodernityDB.database import RecordNotFound
import numpy as np import numpy as np
from pykat.testing.web.database_indices import TestIDIndex, SrcCommitIndex, KatTestIndex from pykat.testing.web.database_indices import TestIDIndex, SrcCommitIndex, KatTestIndex
import re
import os, sys, traceback import os, sys, traceback
global current_test, scheduled_tests, schedule_lock global current_test, scheduled_tests, schedule_lock,enabled_suites
test_id = 0 test_id = 0
current_test = None current_test = None
scheduled_tests = [] scheduled_tests = []
schedule_lock = Lock() schedule_lock = Lock()
watcher = None watcher = None
enabled_suites = ["physics","random"]
commit_check_seconds = 600
print "Starting up database" print "Starting up database"
...@@ -59,8 +61,9 @@ else: ...@@ -59,8 +61,9 @@ else:
SRC_GIT_PATH = os.path.join(app.instance_path, "finesse_src",".git") SRC_GIT_PATH = os.path.join(app.instance_path, "finesse_src",".git")
# get HEAD commit to set as starting point for commit checker # get HEAD commit to set as starting point for commit checker
latest_data = utils.git(['--git-dir',SRC_GIT_PATH,"log","-1",'--pretty=format:"%H"']) latest_data = utils.git(['--git-dir',SRC_GIT_PATH,"log","-2",'--pretty=format:"%H"'])
latest_commit_id_tested = latest_data[0].split("\n")[0].rstrip('"').lstrip("\\")
latest_commit_id_tested = latest_data[0].split("\n")[1].replace('"',"").replace("\\","")
print "loading web interface" print "loading web interface"
...@@ -129,7 +132,7 @@ class FinesseProcessWatcher(Thread): ...@@ -129,7 +132,7 @@ class FinesseProcessWatcher(Thread):
if self.process_to_watch is not None: if self.process_to_watch is not None:
for suite in self.process_to_watch.run_times.keys(): for suite in self.process_to_watch.run_times.keys():
print suite
for kat in self.process_to_watch.run_times[suite].keys(): for kat in self.process_to_watch.run_times[suite].keys():
key = str(suite) + "_" + str(kat) key = str(suite) + "_" + str(kat)
out = kat.replace(".kat",".out") out = kat.replace(".kat",".out")
...@@ -152,7 +155,6 @@ class FinesseProcessWatcher(Thread): ...@@ -152,7 +155,6 @@ class FinesseProcessWatcher(Thread):
out = utils.git(["log",str(self.process_to_watch.get_version()),"-1",'--pretty="%ai"'],cwd=os.path.join(app.instance_path,"finesse_src")) out = utils.git(["log",str(self.process_to_watch.get_version()),"-1",'--pretty="%ai"'],cwd=os.path.join(app.instance_path,"finesse_src"))
commit_date = out[0].replace("\\","").replace('"','').replace("\n","") commit_date = out[0].replace("\\","").replace('"','').replace("\n","")
print commit_date
try: try:
doc = db.get('kattest', key, with_doc=True)["doc"] doc = db.get('kattest', key, with_doc=True)["doc"]
...@@ -317,6 +319,7 @@ def __finesse_start_test(git_commit, kats): ...@@ -317,6 +319,7 @@ def __finesse_start_test(git_commit, kats):
test_id += 1 test_id += 1
TEST_OUTPUT_PATH = os.path.join(app.instance_path, "tests") TEST_OUTPUT_PATH = os.path.join(app.instance_path, "tests")
if not os.path.exists(TEST_OUTPUT_PATH): if not os.path.exists(TEST_OUTPUT_PATH):
os.mkdir(TEST_OUTPUT_PATH) os.mkdir(TEST_OUTPUT_PATH)
...@@ -649,11 +652,11 @@ def finesse_view(view_test_id): ...@@ -649,11 +652,11 @@ def finesse_view(view_test_id):
@app.route("/finesse/get/kats", methods=["POST"]) @app.route("/finesse/get/kats", methods=["POST"])
def finesse_get_kats(): def finesse_get_kats():
suites = ["physics","random"]
kats = [] kats = []
values = [] values = []
global enabled_suites
for suite in suites: for suite in enabled_suites:
suite_path = os.path.join(app.instance_path,"finesse_test","kat_test",suite) suite_path = os.path.join(app.instance_path,"finesse_test","kat_test",suite)
for file in os.listdir(suite_path): for file in os.listdir(suite_path):
...@@ -682,17 +685,18 @@ def setInterval(interval): ...@@ -682,17 +685,18 @@ def setInterval(interval):
return decorator return decorator
@setInterval(60) @setInterval(commit_check_seconds)
def checkLatestCommits(): def checkLatestCommits():
global latest_commit_id_tested global latest_commit_id_tested
out = utils.git(["log", latest_commit_id_tested[:8] + "..HEAD",'--pretty=format:"%H"'], cwd=SRC_GIT_PATH) out = utils.git(["log", re.sub(r"[\W]",'',latest_commit_id_tested) + "..HEAD",'--pretty=format:"%H"'], cwd=SRC_GIT_PATH)
print "Checking latest commits..." print "Checking latest commits..."
commits_not_tested = [] commits_not_tested = []
try: try:
done_all = True done_all = True
commits = out[0].split("\n") commits = [re.sub(r"[\W]","",t) for t in out[0].split("\n")]
for commit in commits: for commit in commits:
commit.strip() commit.strip()
...@@ -711,8 +715,22 @@ def checkLatestCommits(): ...@@ -711,8 +715,22 @@ def checkLatestCommits():
else: else:
for commit in commits_not_tested: for commit in commits_not_tested:
print "Trying to test " + commit print "Trying to test " + commit
__finesse_start_test(commit) kats = dict()
except util.RunException as ex: # only run random and physics suites
global enabled_suites
for suite in enabled_suites:
suite_path = os.path.join(app.instance_path,"finesse_test","kat_test",suite)
if not suite in kats:
kats[suite] = list()
for file in os.listdir(suite_path):
if file.endswith(".kat"):
kats[suite].append(str(file))
__finesse_start_test(commit,kats)
except utils.RunException as ex:
print "stderr", ex.err print "stderr", ex.err
pass pass
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

AEI Privacy Policy Imprint