1414
1515
1616"""
17- import unittest
1817import os
1918import pytest
2019
@@ -29,93 +28,86 @@ def data_path(filename):
2928 return os .path .join (data_dir , filename )
3029
3130
32- class TestJob ( unittest . TestCase ):
31+ def test_job_basic ( ):
3332
34- def test_job_basic (self ):
35-
36- with pytest .raises (AttributeError ):
37- job = Job (async_job = True )
38- job .get_results ()
39-
40- def test_job_get_results (self ):
41- job = Job (async_job = True )
42- jobid = "12345"
43- outputFormat = "votable"
44- job .jobid = jobid
45- job .parameters ['format' ] = outputFormat
46- responseCheckPhase = DummyResponse ()
47- responseCheckPhase .set_status_code (500 )
48- responseCheckPhase .set_message ("ERROR" )
49- responseCheckPhase .set_data (method = 'GET' ,
50- context = None ,
51- body = 'FINISHED' ,
52- headers = None )
53- waitRequest = "async/" + str (jobid )+ "/phase"
54- connHandler = DummyConnHandler ()
55- connHandler .set_response (waitRequest , responseCheckPhase )
56- job .connHandler = connHandler
57-
58- with pytest .raises (Exception ):
59- job .get_results ()
60-
61- responseCheckPhase .set_status_code (200 )
62- responseCheckPhase .set_message ("OK" )
63- responseGetData = DummyResponse ()
64- responseGetData .set_status_code (500 )
65- responseGetData .set_message ("ERROR" )
66- jobContentFileName = data_path ('result_1.vot' )
67- jobContent = utils .read_file_content (jobContentFileName )
68- responseGetData .set_data (method = 'GET' ,
69- context = None ,
70- body = jobContent ,
71- headers = None )
72- dataRequest = "async/" + str (jobid ) + "/results/result"
73- connHandler .set_response (dataRequest , responseGetData )
74-
75- with pytest .raises (Exception ):
76- job .get_results ()
77-
78- responseGetData .set_status_code (200 )
79- responseGetData .set_message ("OK" )
80- res = job .get_results ()
81- assert len (res ) == 3 , \
82- "Num rows. Expected %d, found %d" % (3 , len (res ))
83- assert len (res .columns ) == 4 , \
84- "Num cols. Expected %d, found %d" % (4 , len (res .columns ))
85- for cn in ['alpha' , 'delta' , 'source_id' , 'table1_oid' ]:
86- if cn not in res .colnames :
87- self .fail (cn + " column name not found" + str (res .colnames ))
88-
89- def test_job_phase (self ):
33+ with pytest .raises (AttributeError ):
9034 job = Job (async_job = True )
91- jobid = "12345"
92- outputFormat = "votable"
93- job .jobid = jobid
94- job .parameters ['format' ] = outputFormat
95- job .set_phase ("COMPLETED" )
96- try :
97- job .set_phase ("RUN" )
98- self .fail ("Exception expected. " +
99- "Phase cannot be changed for a finished job" )
100- except ValueError :
101- # ok
102- pass
103- try :
104- job .start ()
105- self .fail ("Exception expected. " +
106- "A job in 'COMPLETE' phase cannot be started" )
107- except ValueError :
108- # ok
109- pass
110- try :
111- job .abort ()
112- self .fail ("Exception expected. " +
113- "A job in 'COMPLETE' phase cannot be aborted" )
114- except ValueError :
115- # ok
116- pass
117-
118-
119- if __name__ == "__main__" :
120- # import sys;sys.argv = ['', 'Test.testName']
121- unittest .main ()
35+ job .get_results ()
36+
37+
38+ def test_job_get_results ():
39+ job = Job (async_job = True )
40+ jobid = "12345"
41+ outputFormat = "votable"
42+ job .jobid = jobid
43+ job .parameters ['format' ] = outputFormat
44+ responseCheckPhase = DummyResponse ()
45+ responseCheckPhase .set_status_code (500 )
46+ responseCheckPhase .set_message ("ERROR" )
47+ responseCheckPhase .set_data (method = 'GET' ,
48+ context = None ,
49+ body = 'FINISHED' ,
50+ headers = None )
51+ waitRequest = "async/" + str (jobid )+ "/phase"
52+ connHandler = DummyConnHandler ()
53+ connHandler .set_response (waitRequest , responseCheckPhase )
54+ job .connHandler = connHandler
55+
56+ with pytest .raises (Exception ):
57+ job .get_results ()
58+
59+ responseCheckPhase .set_status_code (200 )
60+ responseCheckPhase .set_message ("OK" )
61+ responseGetData = DummyResponse ()
62+ responseGetData .set_status_code (500 )
63+ responseGetData .set_message ("ERROR" )
64+ jobContentFileName = data_path ('result_1.vot' )
65+ jobContent = utils .read_file_content (jobContentFileName )
66+ responseGetData .set_data (method = 'GET' ,
67+ context = None ,
68+ body = jobContent ,
69+ headers = None )
70+ dataRequest = "async/" + str (jobid ) + "/results/result"
71+ connHandler .set_response (dataRequest , responseGetData )
72+
73+ with pytest .raises (Exception ):
74+ job .get_results ()
75+
76+ responseGetData .set_status_code (200 )
77+ responseGetData .set_message ("OK" )
78+ res = job .get_results ()
79+ assert len (res ) == 3
80+ assert len (res .columns ) == 4
81+ for cn in ['alpha' , 'delta' , 'source_id' , 'table1_oid' ]:
82+ if cn not in res .colnames :
83+ pytest .fail (cn + " column name not found" + str (res .colnames ))
84+
85+
86+ def test_job_phase ():
87+ job = Job (async_job = True )
88+ jobid = "12345"
89+ outputFormat = "votable"
90+ job .jobid = jobid
91+ job .parameters ['format' ] = outputFormat
92+ job .set_phase ("COMPLETED" )
93+ try :
94+ job .set_phase ("RUN" )
95+ pytest .fail ("Exception expected. " +
96+ "Phase cannot be changed for a finished job" )
97+ except ValueError :
98+ # ok
99+ pass
100+ try :
101+ job .start ()
102+ pytest .fail ("Exception expected. " +
103+ "A job in 'COMPLETE' phase cannot be started" )
104+ except ValueError :
105+ # ok
106+ pass
107+ try :
108+ job .abort ()
109+ pytest .fail ("Exception expected. " +
110+ "A job in 'COMPLETE' phase cannot be aborted" )
111+ except ValueError :
112+ # ok
113+ pass
0 commit comments