Skip to content
Snippets Groups Projects
Commit 9fa6575f authored by Julie Brossard's avatar Julie Brossard
Browse files

Merge branch '8-comp_baseline_1.0' into 'develop'

Resolve "Upgrade OTB to 7.1"

See merge request !9
parents 9bb57bba dd40fab7
No related branches found
No related tags found
2 merge requests!11Continuous Integration for WASP,!9Resolve "Upgrade OTB to 7.1"
......@@ -20,11 +20,11 @@ add_test(NAME test_S2A_T33UUU_8_20150727
WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
)
set_tests_properties(test_S2A_T33UUU_8_20150727 PROPERTIES TIMEOUT 5000)
set_tests_properties(test_S2A_T33UUU_8_20150727 PROPERTIES TIMEOUT 9000)
add_test(NAME test_S2X_T31TCJ_11_20180511
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_S2X_T31TCJ_11_20180511.py
WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
)
set_tests_properties(test_S2X_T31TCJ_11_20180511 PROPERTIES TIMEOUT 7000)
set_tests_properties(test_S2X_T31TCJ_11_20180511 PROPERTIES TIMEOUT 9000)
......@@ -57,6 +57,7 @@ class BaseComparison():
args.weightdatemin = None
args.scatteringcoeffpath = None
args.logging = "" #Disable logging
args.nthreads = None
return args
def setupEnvironment(self):
......
......@@ -54,7 +54,7 @@ class T33UUU_20150727(unittest.TestCase, BaseComparison):
self.test_name, "INPUTS", i) for i in self.inputs]
print('[%s]' % ', '.join(map(str, input_path)))
for xml in input_path:
if(not self.assertTrue(os.path.exists(xml))):
if(not os.path.exists(xml)):
print("Cannot find %s".format(xml))
out = self.execPath
ts = WASP.TemporalSynthesis(self.createArgs(input_path, out))
......
......@@ -48,7 +48,7 @@ class T31TCH_20171008(unittest.TestCase, BaseComparison):
self.test_name, "INPUTS", i) for i in self.inputs]
print('[%s]' % ', '.join(map(str, input_path)))
for xml in input_path:
if(not self.assertTrue(os.path.exists(xml))):
if(not os.path.exists(xml)):
print("Cannot find %s".format(xml))
out = self.execPath
ts = WASP.TemporalSynthesis(self.createArgs(input_path, out))
......
......@@ -48,7 +48,7 @@ class T31TGL_20180321(unittest.TestCase, BaseComparison):
self.test_name, "INPUTS", i) for i in self.inputs]
print('[%s]' % ', '.join(map(str, input_path)))
for xml in input_path:
if(not self.assertTrue(os.path.exists(xml))):
if(not os.path.exists(xml)):
print("Cannot find %s".format(xml))
out = self.execPath
ts = WASP.TemporalSynthesis(self.createArgs(input_path, out))
......
......@@ -50,7 +50,7 @@ class FR_LUS_20180315(unittest.TestCase, BaseComparison):
self.test_name, "INPUTS", i) for i in self.inputs]
print('[%s]' % ', '.join(map(str, input_path)))
for xml in input_path:
if(not self.assertTrue(os.path.exists(xml))):
if(not os.path.exists(xml)):
print("Cannot find %s".format(xml))
out = self.execPath
date = "20180207"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment