bugfix for slow tests

tests/test_caching.py

@@ -149,6 +149,7 @@ def run(self, dt_sec, step_start, step_end):
         self.compare_reference('dis', check='tss', step_length=dt_sec)
         self.compare_reference('chanq', check='tss', step_length=dt_sec)
 
+
     def test_dis_daily(self):
         self.run('86400', '02/01/2016 06:00', '02/07/2016 06:00')
 

tests/test_results.py

@@ -30,6 +30,8 @@
 @pytest.mark.slow
 class TestCatch(ETRS89TestCase):
     case_dir = os.path.join(os.path.dirname(__file__), 'data', 'LF_ETRS89_UseCase')
+    mk_path_out(os.path.join(case_dir, 'out'))
+
     modules_to_set = (
         'SplitRouting',
         'simulateReservoirs',
@@ -68,6 +70,7 @@ def run(self, dt_sec, step_start, step_end):
                                            'StepEnd': step_end,
                                            'DtSec': dt_sec,
                                            'PathOut': output_dir})
+        mk_path_out(output_dir)
         lisfloodexe(settings)
 
     def test_output_daily(self):
@@ -115,6 +118,7 @@ def test_initvars(self):
                               vars_to_set={'StepStart': '02/02/2016 06:00',
                                            'StepEnd': '05/02/2016 06:00',
                                            'PathOut': output_dir})
+        mk_path_out(output_dir)
         lisfloodexe(settings)
         initcond_files = ('ch2cr.end.nc', 'chanq.end.nc', 'chcro.end.nc', 
                         'chside.end.nc', 'cseal.end.nc', 'cum.end.nc', 

tests/test_utils.py

@@ -239,6 +239,33 @@ class ETRS89TestCase(object):
             },
         },
     }
+    def teardown_method(self):
+        settings = LisSettings.instance()
+        output_dir = settings.output_dir
+        shutil.rmtree(output_dir)
+
+    @classmethod
+    def compare_reference(cls, variable='dis', check='map', step_length='86400'):
+        """
+        :param variable: variable to check. Default 'dis' (Discharge)
+        :param check: either 'map' or 'tss'. Default 'map'
+        :param step_length: DtSec (86400 for daily and 21600 for 6h run)
+        """
+
+        settings = LisSettings.instance()
+        binding = settings.binding
+        reference = cls.reference_files[variable][step_length][check]
+
+        if check == 'map':
+            output_map = os.path.normpath(binding[cls.reference_files[variable]['report_map']]) + '.nc'
+            comparator = NetCDFComparator(settings.maskpath)
+            comparator.compare_files(reference, output_map)
+        elif check == 'tss':
+            output_tss = binding[cls.reference_files[variable]['report_tss']]
+            comparator = TSSComparator()
+            comparator.compare_files(reference, output_tss)
+        # If there are differences, test fails before reaching this line (AssertionError(s) in comparator methods)
+        assert True
 
 class MCTTestCase(object):
     case_dir = os.path.join(os.path.dirname(__file__), 'data', 'LF_MCT_UseCase')