diff --git a/cscs-checks/tools/io/cdo.py b/cscs-checks/tools/io/cdo.py index 207ed5d25b..5b3d81cd02 100644 --- a/cscs-checks/tools/io/cdo.py +++ b/cscs-checks/tools/io/cdo.py @@ -110,8 +110,8 @@ def __init__(self): # TODO: Add here also Warning? then it fails currently... self.sanity_patterns = sn.all([ sn.assert_not_found(r'(?i)unsupported|error', self.stderr), - sn.assert_found(r'info: Processed 5 variables over 1 timestep', - self.stderr) + sn.assert_found(r'info: Processed( 688128 values from)? ' + r'5 variables over 1 timestep', self.stderr) ]) @@ -126,8 +126,8 @@ def __init__(self): # TODO: fails currently with the file test_hgroups.nc4 self.sanity_patterns = sn.all([ sn.assert_not_found(r'(?i)unsupported|error', self.stderr), - sn.assert_found(r'info: Processed 3 variables over 8 timestep', - self.stderr) + sn.assert_found(r'info: Processed( 442368 values from)? ' + r'3 variables over 8 timestep', self.stderr) ]) @@ -141,8 +141,8 @@ def __init__(self): 'info', 'test_echam_spectral-deflated_wind10_wl_ws.nc4c'] self.sanity_patterns = sn.all([ sn.assert_not_found(r'(?i)unsupported|error', self.stderr), - sn.assert_found(r'info: Processed 3 variables over 8 timestep', - self.stderr) + sn.assert_found(r'info: Processed( 442368 values from)? ' + r'3 variables over 8 timestep', self.stderr) ]) @@ -161,8 +161,8 @@ def __init__(self): ] self.sanity_patterns = sn.all([ sn.assert_not_found(r'(?i)unsupported|error', self.stderr), - sn.assert_found(r'merge: Processed 3 variables over 3 timesteps?', - self.stderr) + sn.assert_found(r'merge: Processed( 98304 values from)? ' + r'3 variables', self.stderr) ]) @@ -181,8 +181,8 @@ def __init__(self): ] self.sanity_patterns = sn.all([ sn.assert_not_found(r'(?i)unsupported|error', self.stderr), - sn.assert_found(r'merge: Processed 3 variables over 24 timesteps?', - self.stderr) + sn.assert_found(r'merge: Processed( 442368 values from)? ' + r'3 variables', self.stderr) ]) @@ -202,6 +202,6 @@ def __init__(self): ] self.sanity_patterns = sn.all([ sn.assert_not_found(r'(?i)unsupported|error', self.stderr), - sn.assert_found(r'merge: Processed 3 variables over 24 timesteps?', - self.stderr) - ]) \ No newline at end of file + sn.assert_found(r'merge: Processed( 442368 values from)? ' + r'3 variables', self.stderr) + ])