summaryrefslogtreecommitdiff
path: root/kpov_judge/test_task.py
diff options
context:
space:
mode:
authorgasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>2014-11-24 20:23:14 +0000
committergasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>2014-11-24 20:23:14 +0000
commit1be8dd6acfe46396b599cb1e2b9ebb22b0d98b98 (patch)
tree955090509035c1d379095c90d1e13ba1566af51f /kpov_judge/test_task.py
parentd1ab13f03d125553447cb59cb9b1ba15abbc7605 (diff)
Started work on updating add_task to make the web interface functional after the test_task.py rewrite
git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@12 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
Diffstat (limited to 'kpov_judge/test_task.py')
-rwxr-xr-xkpov_judge/test_task.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/kpov_judge/test_task.py b/kpov_judge/test_task.py
index c6f6014..0d12629 100755
--- a/kpov_judge/test_task.py
+++ b/kpov_judge/test_task.py
@@ -149,8 +149,10 @@ if __name__ == '__main__':
# TODO: if the task name is missing or invalid, try to get a list of tasks
# get task source and generate params if neccessarry
try:
- if params['task_url'].startswith('http'):
- http_auth(params['task_url'], params['username'], params['password'])
+ task_url = params['task_url']
+ task_name = params['task_name']
+ if task_url.startswith('http'):
+ http_auth(task_url, params['username'], params['password'])
req = urllib2.Request("{task_url}/{task_name}/task.py".format(**params))
source = urllib2.urlopen(req)
task, task_check, task_params_meta, gen_params = load_task(source)
@@ -169,7 +171,7 @@ if __name__ == '__main__':
task_params = params['task_params'][params['task_name']]
if basic_args.generate_params:
task_params.update(gen_params(params['username'], task_params_meta))
- if params['task_url'].startswith('http'):
+ if task_url.startswith('http'):
req = urllib2.Request("{task_url}/{task_name}/params.json".format(**params))
web_task_params = json.load(urllib2.urlopen(req))
task_params.update(web_task_params)