Skip to content

make CDL tests independent of attribute string typing #2133

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
marqh wants to merge 2 commits into from
Closed

make CDL tests independent of attribute string typing #2133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a88c9fb
make CDL tests independent of attribute string typing
marqh Sep 7, 2016
81f9bd8
update with regex sub
marqh Oct 3, 2016
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
14 changes: 14 additions & 0 deletions lib/iris/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import logging
import os
import os.path
import re
import shutil
import subprocess
import sys
Expand Down Expand Up @@ -205,6 +206,19 @@ def setUpClass(cls):
iris.site_configuration['cf_profile'] = None

def _assert_str_same(self, reference_str, test_str, reference_filename, type_comparison_name='Strings'):
# Work around to deal with alterations to attribute typing in
# netcdf4python, introduced in 1.1 and present in 1.2. see:
# https://github.com/Unidata/netcdf-c/issues/298
# https://github.com/Unidata/netcdf4-python/issues/529
# https://github.com/Unidata/netcdf4-python/issues/575
# amongst others for further details.
if type_comparison_name == 'CDL' and reference_str != test_str:
# Match where a new line contains only:
# tab|tab|string |attr_definition.
pattern = re.compile('(^\t\t)string (.+)$', re.MULTILINE)
# Replace with tab|tab|attr_definition.
replacement = r'\t\t\2'
Copy link
Member

@QuLogic QuLogic Oct 3, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A raw string means the tab isn't interpreted; how does it pass?

test_str = re.sub(pattern, replacement, test_str)
if reference_str != test_str:
diff = ''.join(difflib.unified_diff(reference_str.splitlines(1), test_str.splitlines(1),
'Reference', 'Test result', '', '', 0))
Expand Down