Skip to content

Commit

Permalink
ok got a format and a conditional pytest.xfail approach i am OK with.…
Browse files Browse the repository at this point in the history
… push to make sure this xfails in the pipeline appropriately
  • Loading branch information
ilaflott committed Jan 13, 2025
1 parent 8a71625 commit da8b4d3
Show file tree
Hide file tree
Showing 3 changed files with 196 additions and 190 deletions.
1 change: 1 addition & 0 deletions fre/cmor/cmor_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def get_var_filenames(indir, var_filenames = None, local_var = None):
var_filenames = []
filename_pattern = '.nc' if local_var is None else f'.{local_var}.nc'
print(f'(get_var_filenames) filename_pattern = {filename_pattern}\n')
print(f'(get_var_filenames) indir = {indir}\n')
var_filenames_all = glob.glob(f'{indir}/*{filename_pattern}')
#print(f'(get_var_filenames) var_filenames_all = {var_filenames_all}')
for var_file in var_filenames_all:
Expand Down
6 changes: 3 additions & 3 deletions fre/cmor/tests/test_cmor_run_subtool.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
ROOTDIR = 'fre/tests/test_files'

# setup- cmip/cmor variable table(s)
CLONE_REPO_PATH = \
CMIP6_TABLE_REPO_PATH = \
f'{ROOTDIR}/cmip6-cmor-tables'
TABLE_CONFIG = \
f'{CLONE_REPO_PATH}/Tables/CMIP6_Omon.json'
f'{CMIP6_TABLE_REPO_PATH}/Tables/CMIP6_Omon.json'

def test_setup_cmor_cmip_table_repo():
''' setup routine, make sure the recursively cloned tables exist '''
assert all( [ Path(CLONE_REPO_PATH).exists(),
assert all( [ Path(CMIP6_TABLE_REPO_PATH).exists(),
Path(TABLE_CONFIG).exists()
] )

Expand Down
Loading

0 comments on commit da8b4d3

Please sign in to comment.