From 35393ba130fab45db85b39652036e74a14d20c29 Mon Sep 17 00:00:00 2001 From: Samuel Omlin Date: Tue, 18 Feb 2020 12:44:09 +0100 Subject: [PATCH 1/2] [daint] Fix CDO checks --- cscs-checks/tools/io/cdo.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cscs-checks/tools/io/cdo.py b/cscs-checks/tools/io/cdo.py index 207ed5d25b..ef9d96bfc1 100644 --- a/cscs-checks/tools/io/cdo.py +++ b/cscs-checks/tools/io/cdo.py @@ -110,7 +110,7 @@ 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', + sn.assert_found(r'info: Processed( 688128 values from)? 5 variables over 1 timestep', self.stderr) ]) @@ -126,7 +126,7 @@ 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', + sn.assert_found(r'info: Processed( 442368 values from)? 3 variables over 8 timestep', self.stderr) ]) @@ -141,7 +141,7 @@ 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', + sn.assert_found(r'info: Processed( 442368 values from)? 3 variables over 8 timestep', self.stderr) ]) @@ -161,7 +161,7 @@ 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?', + sn.assert_found(r'merge: Processed( 98304 values from)? 3 variables', self.stderr) ]) @@ -181,7 +181,7 @@ 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?', + sn.assert_found(r'merge: Processed( 442368 values from)? 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?', + sn.assert_found(r'merge: Processed( 442368 values from)? 3 variables', self.stderr) - ]) \ No newline at end of file + ]) From 3861207744f73dee172d9bb13f3a083b4623daaa Mon Sep 17 00:00:00 2001 From: Samuel Omlin Date: Tue, 18 Feb 2020 12:51:13 +0100 Subject: [PATCH 2/2] Fix formatting --- cscs-checks/tools/io/cdo.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cscs-checks/tools/io/cdo.py b/cscs-checks/tools/io/cdo.py index ef9d96bfc1..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( 688128 values from)? 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( 442368 values from)? 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( 442368 values from)? 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( 98304 values from)? 3 variables', - 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( 442368 values from)? 3 variables', - 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( 442368 values from)? 3 variables', - self.stderr) + sn.assert_found(r'merge: Processed( 442368 values from)? ' + r'3 variables', self.stderr) ])