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

Resolve "Upgrade OTB to 7.1"

See merge request !9

PythonScripts/CMakeLists.txt

@@ -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)

PythonScripts/base_comparison.py

@@ -57,6 +57,7 @@ class BaseComparison():
         args.weightdatemin = None
         args.scatteringcoeffpath = None
         args.logging = "" #Disable logging
+        args.nthreads = None
         return args
 
     def setupEnvironment(self):

PythonScripts/test_S2A_T33UUU_8_20150727.py

@@ -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))

PythonScripts/test_S2B_T31TCH_1_20171008.py

@@ -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))

PythonScripts/test_S2B_T31TGL_1_20180321.py

@@ -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))

PythonScripts/test_VNS_FR-LUS_4_20180207.py

@@ -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"