Skip to content

Make roundtrip checking more precise + improve some tests accordingly. #5402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pp-mo wants to merge 2 commits into from
Closed

Make roundtrip checking more precise + improve some tests accordingly. #5402

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
249bdb6
Make roundtrip checking more precise + improve some tests accordingly.
pp-mo Jul 30, 2023
f859754
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions lib/iris/tests/integration/test_netcdf__loadsaveattrs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

# A list of "global-style" attribute names : those which should be global attributes by
# default (i.e. file- or group-level, *not* attached to a variable).

_GLOBAL_TEST_ATTRS = set(iris.fileformats.netcdf.saver._CF_GLOBAL_ATTRS)
# Remove this one, which has peculiar behaviour + is tested separately
# N.B. this is not the same as 'Conventions', but is caught in the crossfire when that
Expand Down Expand Up @@ -263,16 +264,15 @@ def check_roundtrip_results(
else:
assert self.attrname in ds.ncattrs()
assert ds.getncattr(self.attrname) == global_attr_value
if var_attr_vals:
var_attr_vals = self._default_vars_and_attrvalues(var_attr_vals)
for var_name, value in var_attr_vals.items():
assert var_name in ds.variables
v = ds.variables[var_name]
if value is None:
assert self.attrname not in v.ncattrs()
else:
assert self.attrname in v.ncattrs()
assert v.getncattr(self.attrname) == value
var_attr_vals = self._default_vars_and_attrvalues(var_attr_vals)
for var_name, value in var_attr_vals.items():
assert var_name in ds.variables
v = ds.variables[var_name]
if value is None:
assert self.attrname not in v.ncattrs()
else:
assert self.attrname in v.ncattrs()
assert v.getncattr(self.attrname) == value

#######################################################
# Tests on "user-style" attributes.
Expand Down Expand Up @@ -302,7 +302,7 @@ def test_02_userstyle_single_local(self):
# It results in a "promoted" global attribute.
self.create_roundtrip_testcase(
attr_name="myname", # A generic "user" attribute with no special handling
vars_values_file1={"myvar": "single-value"},
vars_values_file1="single-value",
)
self.check_roundtrip_results(
global_attr_value="single-value", # local values eclipse the global ones
Expand Down Expand Up @@ -545,10 +545,12 @@ def test_16_localstyle(self, local_attr, origin_style):
attr_name=local_attr, vars_values_file1=attrval
)

if local_attr in iris.fileformats.netcdf.saver._CF_DATA_ATTRS:
# These ones are simply discarded on loading.
# By experiment, this overlap between _CF_ATTRS and _CF_DATA_ATTRS
# currently contains only 'missing_value' and 'standard_error_multiplier'.
if (
local_attr in ("missing_value", "standard_error_multiplier")
and origin_style == "input_local"
):
# These ones are actually discarded by roundtrip.
# Not clear why, but for now this captures the facts.
expect_global = None
expect_var = None
else:
Expand Down