From 37990fc022a974c21e1e5c09959b7548a3e10c5c Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Mon, 12 Nov 2012 15:24:42 +0100 Subject: [PATCH] Modifications to remove errors in Jenkins. --- sfa/senslab/OARrestapi.py | 2 -- sfa/senslab/tests/TestSuite.py | 11 ++++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sfa/senslab/OARrestapi.py b/sfa/senslab/OARrestapi.py index e530e1fe..1bcd89d2 100644 --- a/sfa/senslab/OARrestapi.py +++ b/sfa/senslab/OARrestapi.py @@ -11,8 +11,6 @@ from sfa.util.config import Config from sfa.util.sfalogging import logger -OARIP = '194.199.16.166' - OAR_REQUEST_POST_URI_DICT = {'POST_job':{'uri': '/oarapi/jobs.json'}, 'DELETE_jobs_id':{'uri':'/oarapi/jobs/id.json'}, diff --git a/sfa/senslab/tests/TestSuite.py b/sfa/senslab/tests/TestSuite.py index afe83587..7f43ee67 100644 --- a/sfa/senslab/tests/TestSuite.py +++ b/sfa/senslab/tests/TestSuite.py @@ -205,7 +205,8 @@ def TestOAR(job_id = None): job_id = job_id[0] else: job_id = '1' - + else: + job_id = '1' print "JOB_ID", job_id oar = OARrestapi() jobs = oar.parser.SendRequest("GET_reserved_nodes", username = 'avakian') @@ -316,10 +317,10 @@ def TestSfi(arg = None): create = os.system("sfi.py create senslab2.avakian_slice /home/savakian/flab-sfa/rspec_sfa.rspec") -def RunAll(job_id = 1): - TestLdap(job_id) - TestOAR(job_id) - TestSlabDriver(job_id) +def RunAll( arg ): + TestLdap() + TestOAR() + TestSlabDriver() TestSfi() -- 2.43.0