From 728889de32d867be1f44fd44d78f36f63c90cda4 Mon Sep 17 00:00:00 2001 From: jasonjunweilyu <161689601+jasonjunweilyu@users.noreply.github.com> Date: Mon, 25 Mar 2024 23:52:05 +1000 Subject: [PATCH] Fix test error (#291) --- .../skeleton/algorithm/algorithm_mod.x90 | 2 +- ...yclone.py => test_psyclone_system_test.py} | 30 +++++++++++-------- ...svn_fcm.py => test_svn_fcm_system_test.py} | 0 ...t_svn_fcm.py => test_svn_fcm_unit_test.py} | 0 ...psyclone.py => test_psyclone_unit_test.py} | 0 5 files changed, 19 insertions(+), 13 deletions(-) rename tests/system_tests/psyclone/{test_psyclone.py => test_psyclone_system_test.py} (88%) rename tests/system_tests/svn_fcm/{test_svn_fcm.py => test_svn_fcm_system_test.py} (100%) rename tests/unit_tests/steps/grab/{test_svn_fcm.py => test_svn_fcm_unit_test.py} (100%) rename tests/unit_tests/steps/{test_psyclone.py => test_psyclone_unit_test.py} (100%) diff --git a/tests/system_tests/psyclone/skeleton/algorithm/algorithm_mod.x90 b/tests/system_tests/psyclone/skeleton/algorithm/algorithm_mod.x90 index 62b412bf..be898fb0 100644 --- a/tests/system_tests/psyclone/skeleton/algorithm/algorithm_mod.x90 +++ b/tests/system_tests/psyclone/skeleton/algorithm/algorithm_mod.x90 @@ -46,7 +46,7 @@ contains ! Set the new field to a constant value and compute the divergence of it divergence => get_div() s = 2.0_r_def - call invoke( name = "Compute divergence", & + call invoke( name = "Compute_divergence", & setval_c(field_2, s ), & setval_c(field_1, 0.0_r_def), & my_kernel_type(field_1, field_2, divergence) ) diff --git a/tests/system_tests/psyclone/test_psyclone.py b/tests/system_tests/psyclone/test_psyclone_system_test.py similarity index 88% rename from tests/system_tests/psyclone/test_psyclone.py rename to tests/system_tests/psyclone/test_psyclone_system_test.py index 4a06502a..b033573d 100644 --- a/tests/system_tests/psyclone/test_psyclone.py +++ b/tests/system_tests/psyclone/test_psyclone_system_test.py @@ -154,23 +154,29 @@ def test_run(self, config): # if these files exist after the run then we know: # a) the expected files were created # b) the prebuilds were protected from automatic cleanup - expect_files = [ - # there should be an f90 and a _psy.f90 built from the x90 - config.build_output / 'algorithm/algorithm_mod.f90', - config.build_output / 'algorithm/algorithm_mod_psy.f90', - + expect_prebuild_files = [ # Expect these prebuild files - # todo: the kernal hash differs between fpp and cpp, perhaps just use wildcards. - config.prebuild_folder / 'algorithm_mod.1602753696.an', # x90 analysis result - config.prebuild_folder / 'my_kernel_mod.4187107526.an', # kernel analysis results - config.prebuild_folder / 'algorithm_mod.5088673431.f90', # prebuild - config.prebuild_folder / 'algorithm_mod_psy.5088673431.f90', # prebuild + # The kernel hash differs between fpp and cpp, so just use wildcards. + 'algorithm_mod.*.an', # x90 analysis result + 'my_kernel_mod.*.an', # kernel analysis results + 'algorithm_mod.*.f90', # prebuild + 'algorithm_mod_psy.*.f90', # prebuild + ] + + expect_build_files = [ + # there should be an f90 and a _psy.f90 built from the x90 + 'algorithm/algorithm_mod.f90', + 'algorithm/algorithm_mod_psy.f90', ] - assert all(not f.exists() for f in expect_files) + # Glob returns a generator, which can't simply be tested if it's empty. + # So use a list instead: + assert all(list(config.prebuild_folder.glob(f)) == [] for f in expect_prebuild_files) + assert all(list(config.build_output.glob(f)) == [] for f in expect_build_files) with config: self.steps(config) - assert all(f.exists() for f in expect_files) + assert all(list(config.prebuild_folder.glob(f)) != [] for f in expect_prebuild_files) + assert all(list(config.build_output.glob(f)) != [] for f in expect_build_files) def test_prebuild(self, tmp_path, config): with config: diff --git a/tests/system_tests/svn_fcm/test_svn_fcm.py b/tests/system_tests/svn_fcm/test_svn_fcm_system_test.py similarity index 100% rename from tests/system_tests/svn_fcm/test_svn_fcm.py rename to tests/system_tests/svn_fcm/test_svn_fcm_system_test.py diff --git a/tests/unit_tests/steps/grab/test_svn_fcm.py b/tests/unit_tests/steps/grab/test_svn_fcm_unit_test.py similarity index 100% rename from tests/unit_tests/steps/grab/test_svn_fcm.py rename to tests/unit_tests/steps/grab/test_svn_fcm_unit_test.py diff --git a/tests/unit_tests/steps/test_psyclone.py b/tests/unit_tests/steps/test_psyclone_unit_test.py similarity index 100% rename from tests/unit_tests/steps/test_psyclone.py rename to tests/unit_tests/steps/test_psyclone_unit_test.py