Skip to content

Commit f9b4416

Browse files
committed
Handle env variables OQ_CHECK_MISSING_OUTPUTS and OQ_TEST_RUN_CALC
1 parent 443c165 commit f9b4416

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

svir/test/integration/test_drive_oq_engine.py

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,18 @@
5858
QGIS_APP = start_app()
5959

6060
LONG_LOADING_TIME = 10 # seconds
61-
ONLY_OUTPUT_TYPE = os.environ.get('ONLY_OUTPUT_TYPE')
61+
ONLY_OUTPUT_TYPE = (
62+
False if os.environ.get('ONLY_OUTPUT_TYPE') != '1' else True)
63+
OQ_CHECK_MISSING_OUTPUTS = (
64+
False if os.environ.get('OQ_CHECK_MISSING_OUTPUTS') != '1' else True)
65+
OQ_TEST_RUN_CALC = (
66+
False if os.environ.get('OQ_TEST_RUN_CALC') != '1' else True)
6267

6368

6469
def run_all():
70+
print(f'{ONLY_OUTPUT_TYPE=}')
71+
print(f'{OQ_CHECK_MISSING_OUTPUTS=}')
72+
print(f'{OQ_TEST_RUN_CALC=}')
6573
suite = unittest.TestSuite()
6674
# OQ_CSV_TO_LAYER_TYPES
6775
suite.addTest(unittest.makeSuite(LoadAggRiskTestCase, 'test'))
@@ -142,7 +150,7 @@ def setUpClass(cls):
142150
if cls.only_calc_id is not None:
143151
cls.calc_list = [calc for calc in cls.calc_list
144152
if calc['id'] == cls.only_calc_id]
145-
cls.only_output_type = os.environ.get('ONLY_OUTPUT_TYPE')
153+
cls.only_output_type = ONLY_OUTPUT_TYPE
146154
if not cls.only_output_type:
147155
print('ONLY_OUTPUT_TYPE was not set. Running tests for all'
148156
' the available output types')
@@ -928,10 +936,11 @@ class AllLoadableOutputsFoundInDemosTestCase(LoadOqEngineOutputsTestCase):
928936
'only testing output type %s' % ONLY_OUTPUT_TYPE)
929937
def test_all_loadable_output_types_found_in_demos(self):
930938
self.list_calculations_and_outputs()
931-
if self.only_calc_id or self.only_output_type:
932-
print('Skipping test checking if all loadable outputs are found'
933-
' in demos')
934-
return
939+
if (self.only_calc_id or self.only_output_type
940+
or not OQ_CHECK_MISSING_OUTPUTS):
941+
self.skipTest(
942+
'Skipping test checking if all loadable outputs are found'
943+
' in demos')
935944
loadable_output_types_found = set()
936945
loadable_output_types_not_found = set()
937946
for loadable_output_type in OQ_ALL_TYPES:
@@ -982,8 +991,8 @@ class AllLoadersAreImplementedTestCase(LoadOqEngineOutputsTestCase):
982991
def test_all_loaders_are_implemented(self):
983992
self.list_calculations_and_outputs()
984993
if self.only_calc_id or self.only_output_type:
985-
print('Skipping test checking if any loaders are not implemented')
986-
return
994+
self.skipTest(
995+
'Skipping test checking if any loaders are not implemented')
987996
not_implemented_loaders = set()
988997
for calc in self.calc_list:
989998
for output in self.output_list[calc['id']]:
@@ -1002,9 +1011,9 @@ class RunCalculationTestCase(LoadOqEngineOutputsTestCase):
10021011
@unittest.skipIf(ONLY_OUTPUT_TYPE,
10031012
'only testing output type %s' % ONLY_OUTPUT_TYPE)
10041013
def test_run_calculation(self):
1005-
if self.only_calc_id or self.only_output_type:
1006-
print('Skipping test running a new calculation')
1007-
return
1014+
if (self.only_calc_id or self.only_output_type
1015+
or not OQ_TEST_RUN_CALC):
1016+
self.skipTest('Skipping test running a new calculation')
10081017
risk_demos_path = os.path.join(
10091018
os.pardir, 'oq-engine', 'demos', 'risk')
10101019
risk_demos_dirs = glob.glob(os.path.join(risk_demos_path, "*", ""))

0 commit comments

Comments
 (0)