diff options
author | Anthon van der Neut <anthon@mnt.org> | 2015-09-15 17:05:18 +0200 |
---|---|---|
committer | Anthon van der Neut <anthon@mnt.org> | 2015-09-15 17:05:18 +0200 |
commit | 2adaf377dfea63c52da8a6ed3a17757ab398c7b6 (patch) | |
tree | ef043cde1b1a4f7f8268347f11b00c1d65517477 | |
parent | b163b8d4645e97387650954e1e74c573fffe56db (diff) | |
download | ruamel.yaml-2adaf377dfea63c52da8a6ed3a17757ab398c7b6.tar.gz |
enable pypy test (too many open filehandles)
-rw-r--r-- | test/lib/test_canonical.py | 9 | ||||
-rw-r--r-- | test/lib/test_constructor.py | 9 | ||||
-rw-r--r-- | test/lib/test_emitter.py | 12 | ||||
-rw-r--r-- | test/lib/test_errors.py | 17 | ||||
-rw-r--r-- | test/lib/test_input_output.py | 36 | ||||
-rw-r--r-- | test/lib/test_mark.py | 4 | ||||
-rw-r--r-- | test/lib/test_reader.py | 15 | ||||
-rw-r--r-- | test/lib/test_recursive.py | 3 | ||||
-rw-r--r-- | test/lib/test_representer.py | 3 | ||||
-rw-r--r-- | test/lib/test_resolver.py | 19 | ||||
-rw-r--r-- | test/lib/test_structure.py | 30 | ||||
-rw-r--r-- | test/lib/test_tokens.py | 16 | ||||
-rw-r--r-- | test/lib/test_yaml_ext.py | 46 | ||||
-rw-r--r-- | test/test_anchor.py | 13 | ||||
-rw-r--r-- | test/test_z_data.py | 3 |
15 files changed, 145 insertions, 90 deletions
diff --git a/test/lib/test_canonical.py b/test/lib/test_canonical.py index 48f4699..d2891ce 100644 --- a/test/lib/test_canonical.py +++ b/test/lib/test_canonical.py @@ -5,7 +5,8 @@ import ruamel.yaml import canonical def test_canonical_scanner(canonical_filename, verbose=False): - data = open(canonical_filename, 'rb').read() + with open(canonical_filename, 'rb') as fp0: + data = fp0.read() tokens = list(yaml.canonical_scan(data)) assert tokens, tokens if verbose: @@ -15,7 +16,8 @@ def test_canonical_scanner(canonical_filename, verbose=False): test_canonical_scanner.unittest = ['.canonical'] def test_canonical_parser(canonical_filename, verbose=False): - data = open(canonical_filename, 'rb').read() + with open(canonical_filename, 'rb') as fp0: + data = fp0.read() events = list(yaml.canonical_parse(data)) assert events, events if verbose: @@ -25,7 +27,8 @@ def test_canonical_parser(canonical_filename, verbose=False): test_canonical_parser.unittest = ['.canonical'] def test_canonical_error(data_filename, canonical_filename, verbose=False): - data = open(data_filename, 'rb').read() + with open(data_filename, 'rb') as fp0: + data = fp0.read() try: output = list(yaml.canonical_load_all(data)) except yaml.YAMLError as exc: diff --git a/test/lib/test_constructor.py b/test/lib/test_constructor.py index 544a80e..56ead53 100644 --- a/test/lib/test_constructor.py +++ b/test/lib/test_constructor.py @@ -262,10 +262,12 @@ def test_constructor_types(data_filename, code_filename, verbose=False): native1 = None native2 = None try: - native1 = list(yaml.load_all(open(data_filename, 'rb'), Loader=MyLoader)) + with open(data_filename, 'rb') as fp0: + native1 = list(yaml.load_all(fp0, Loader=MyLoader)) if len(native1) == 1: native1 = native1[0] - native2 = _load_code(open(code_filename, 'rb').read()) + with open(code_filename, 'rb') as fp0: + native2 = _load_code(fp0.read()) try: if native1 == native2: return @@ -289,7 +291,8 @@ test_constructor_types.unittest = ['.data', '.code'] def test_roundtrip_data(code_filename, roundtrip_filename, verbose=False): _make_objects() - value1 = open(code_filename, 'rb').read() + with open(code_filename, 'rb') as fp0: + value1 = fp0 .read() native2 = list(yaml.load_all(value1, Loader=MyLoader)) if len(native2) == 1: native2 = native2[0] diff --git a/test/lib/test_emitter.py b/test/lib/test_emitter.py index c9a5418..39f0c1f 100644 --- a/test/lib/test_emitter.py +++ b/test/lib/test_emitter.py @@ -17,7 +17,8 @@ def _compare_events(events1, events2): assert event1.value == event2.value, (event1, event2) def test_emitter_on_data(data_filename, canonical_filename, verbose=False): - events = list(yaml.parse(open(data_filename, 'rb'))) + with open(data_filename, 'rb') as fp0: + events = list(yaml.parse(fp0)) output = yaml.emit(events) if verbose: print("OUTPUT:") @@ -28,7 +29,8 @@ def test_emitter_on_data(data_filename, canonical_filename, verbose=False): test_emitter_on_data.unittest = ['.data', '.canonical'] def test_emitter_on_canonical(canonical_filename, verbose=False): - events = list(yaml.parse(open(canonical_filename, 'rb'))) + with open(canonical_filename, 'rb') as fp0: + events = list(yaml.parse(fp0)) for canonical in [False, True]: output = yaml.emit(events, canonical=canonical) if verbose: @@ -41,7 +43,8 @@ test_emitter_on_canonical.unittest = ['.canonical'] def test_emitter_styles(data_filename, canonical_filename, verbose=False): for filename in [data_filename, canonical_filename]: - events = list(yaml.parse(open(filename, 'rb'))) + with open(filename, 'rb') as fp0: + events = list(yaml.parse(fp0)) for flow_style in [False, True]: for style in ['|', '>', '"', '\'', '']: styled_events = [] @@ -89,7 +92,8 @@ class EventsLoader(yaml.Loader): EventsLoader.add_constructor(None, EventsLoader.construct_event) def test_emitter_events(events_filename, verbose=False): - events = list(yaml.load(open(events_filename, 'rb'), Loader=EventsLoader)) + with open(events_filename, 'rb') as fp0: + events = list(yaml.load(fp0, Loader=EventsLoader)) output = yaml.emit(events) if verbose: print("OUTPUT:") diff --git a/test/lib/test_errors.py b/test/lib/test_errors.py index f9e8b04..d795c5d 100644 --- a/test/lib/test_errors.py +++ b/test/lib/test_errors.py @@ -6,7 +6,8 @@ import test_emitter def test_loader_error(error_filename, verbose=False): try: - list(yaml.load_all(open(error_filename, 'rb'))) + with open(error_filename, 'rb') as fp0: + list(yaml.load_all(fp0)) except yaml.YAMLError as exc: if verbose: print("%s:" % exc.__class__.__name__, exc) @@ -17,7 +18,8 @@ test_loader_error.unittest = ['.loader-error'] def test_loader_error_string(error_filename, verbose=False): try: - list(yaml.load_all(open(error_filename, 'rb').read())) + with open(error_filename, 'rb') as fp0: + list(yaml.load_all(fp0.read())) except yaml.YAMLError as exc: if verbose: print("%s:" % exc.__class__.__name__, exc) @@ -28,7 +30,8 @@ test_loader_error_string.unittest = ['.loader-error'] def test_loader_error_single(error_filename, verbose=False): try: - yaml.load(open(error_filename, 'rb').read()) + with open(error_filename, 'rb') as fp0: + yaml.load(fp0.read()) except yaml.YAMLError as exc: if verbose: print("%s:" % exc.__class__.__name__, exc) @@ -38,8 +41,9 @@ def test_loader_error_single(error_filename, verbose=False): test_loader_error_single.unittest = ['.single-loader-error'] def test_emitter_error(error_filename, verbose=False): - events = list(yaml.load(open(error_filename, 'rb'), - Loader=test_emitter.EventsLoader)) + with open(error_filename, 'rb') as fp0: + events = list(yaml.load(fp0, + Loader=test_emitter.EventsLoader)) try: yaml.emit(events) except yaml.YAMLError as exc: @@ -51,7 +55,8 @@ def test_emitter_error(error_filename, verbose=False): test_emitter_error.unittest = ['.emitter-error'] def test_dumper_error(error_filename, verbose=False): - code = open(error_filename, 'rb').read() + with open(error_filename, 'rb') as fp0: + code = fp0.read() try: import yaml from yaml.compat import StringIO diff --git a/test/lib/test_input_output.py b/test/lib/test_input_output.py index fd681b9..ef09ed5 100644 --- a/test/lib/test_input_output.py +++ b/test/lib/test_input_output.py @@ -183,27 +183,29 @@ def test_file_output(unicode_filename, verbose=False): stream = BytesIO() yaml.dump(data, stream, encoding='utf-16-le', allow_unicode=True) data2 = stream.getvalue().decode('utf-16-le')[1:] - stream = open(filename, 'w', encoding='utf-16-le') - yaml.dump(data, stream, allow_unicode=True) - stream.close() - data3 = open(filename, 'r', encoding='utf-16-le').read() - stream = open(filename, 'wb') - yaml.dump(data, stream, encoding='utf-8', allow_unicode=True) - stream.close() - data4 = open(filename, 'r', encoding='utf-8').read() + with open(filename, 'w', encoding='utf-16-le') as stream: + yaml.dump(data, stream, allow_unicode=True) + with open(filename, 'r', encoding='utf-16-le') as fp0: + data3 = fp0.read() + with open(filename, 'wb') as stream: + yaml.dump(data, stream, encoding='utf-8', allow_unicode=True) + with open(filename, 'r', encoding='utf-8') as fp0: + data4 = fp0.read() else: - stream = open(filename, 'wb') - yaml.dump(data, stream, allow_unicode=True) - stream.close() - data2 = open(filename, 'rb').read() - stream = open(filename, 'wb') - yaml.dump(data, stream, encoding='utf-16-le', allow_unicode=True) - stream.close() - data3 = open(filename, 'rb').read().decode('utf-16-le')[1:].encode('utf-8') + with open(filename, 'wb') as stream: + yaml.dump(data, stream, allow_unicode=True) + with open(filename, 'rb') as fp0: + data2 = fp0.read() + with open(filename, 'wb') as stream: + yaml.dump(data, stream, encoding='utf-16-le', + allow_unicode=True) + with open(filename, 'rb') as fp0: + data3 = fp0.read().decode('utf-16-le')[1:].encode('utf-8') stream = _unicode_open(open(filename, 'wb'), 'utf-8') yaml.dump(data, stream, allow_unicode=True) stream.close() - data4 = open(filename, 'rb').read() + with open(filename, 'rb') as fp0: + data4 = fp0.read() assert data1 == data2, (data1, data2) assert data1 == data3, (data1, data3) assert data1 == data4, (data1, data4) diff --git a/test/lib/test_mark.py b/test/lib/test_mark.py index 0574f20..c8dc83c 100644 --- a/test/lib/test_mark.py +++ b/test/lib/test_mark.py @@ -5,8 +5,8 @@ import ruamel.yaml as yaml from ruamel.yaml.compat import text_type, PY3 def test_marks(marks_filename, verbose=False): - inputs = open(marks_filename, 'r' if PY3 else 'rb').read( - ).split('---\n')[1:] + with open(marks_filename, 'r' if PY3 else 'rb') as fp0: + inputs = fp0.read().split('---\n')[1:] for input in inputs: index = 0 line = 0 diff --git a/test/lib/test_reader.py b/test/lib/test_reader.py index 157c652..25f67b7 100644 --- a/test/lib/test_reader.py +++ b/test/lib/test_reader.py @@ -19,21 +19,26 @@ def _run_reader(data, verbose): raise AssertionError("expected an exception") def test_stream_error(error_filename, verbose=False): - _run_reader(open(error_filename, 'rb'), verbose) - _run_reader(open(error_filename, 'rb').read(), verbose) + with open(error_filename, 'rb') as fp0: + _run_reader(fp0, verbose) + with open(error_filename, 'rb') as fp0: + _run_reader(fp0.read(), verbose) for encoding in ['utf-8', 'utf-16-le', 'utf-16-be']: try: if PY2: - data = unicode(open(error_filename, 'rb').read(), encoding) + with open(error_filename, 'rb') as fp0: + data = unicode(fp0.read(), encoding) else: - data = open(error_filename, 'rb').read().decode(encoding) + with open(error_filename, 'rb') as fp0: + data = fp0.read().decode(encoding) break except UnicodeDecodeError: pass else: return _run_reader(data, verbose) - _run_reader(io.open(error_filename, encoding=encoding), verbose) + with io.open(error_filename, encoding=encoding) as fp: + _run_reader(fp, verbose) test_stream_error.unittest = ['.stream-error'] diff --git a/test/lib/test_recursive.py b/test/lib/test_recursive.py index 80c726a..913d525 100644 --- a/test/lib/test_recursive.py +++ b/test/lib/test_recursive.py @@ -26,7 +26,8 @@ class AnInstanceWithState(AnInstance): def test_recursive(recursive_filename, verbose=False): context = globals().copy() - exec(open(recursive_filename, 'rb').read(), context) + with open(recursive_filename, 'rb') as fp0: + exec(fp0.read(), context) value1 = context['value'] output1 = None value2 = None diff --git a/test/lib/test_representer.py b/test/lib/test_representer.py index b96b6e4..0bcaa2a 100644 --- a/test/lib/test_representer.py +++ b/test/lib/test_representer.py @@ -9,7 +9,8 @@ def test_representer_types(code_filename, verbose=False): test_constructor._make_objects() for allow_unicode in [False, True]: for encoding in ['utf-8', 'utf-16-be', 'utf-16-le']: - native1 = test_constructor._load_code(open(code_filename, 'rb').read()) + with open(code_filename, 'rb') as fp0: + native1 = test_constructor._load_code(fp0.read()) native2 = None try: output = yaml.dump(native1, Dumper=test_constructor.MyDumper, diff --git a/test/lib/test_resolver.py b/test/lib/test_resolver.py index bc3928f..b88c91c 100644 --- a/test/lib/test_resolver.py +++ b/test/lib/test_resolver.py @@ -9,9 +9,10 @@ def test_implicit_resolver(data_filename, detect_filename, verbose=False): correct_tag = None node = None try: - correct_tag = open(detect_filename, 'r' if PY3 else 'rb').read( - ).strip() - node = yaml.compose(open(data_filename, 'rb')) + with open(detect_filename, 'r' if PY3 else 'rb') as fp0: + correct_tag = fp0.read().strip() + with open(data_filename, 'rb') as fp0: + node = yaml.compose(fp0) assert isinstance(node, yaml.SequenceNode), node for scalar in node.value: assert isinstance(scalar, yaml.ScalarNode), scalar @@ -62,8 +63,10 @@ def _convert_node(node): def test_path_resolver_loader(data_filename, path_filename, verbose=False): _make_path_loader_and_dumper() - nodes1 = list(yaml.compose_all(open(data_filename, 'rb').read(), Loader=MyLoader)) - nodes2 = list(yaml.compose_all(open(path_filename, 'rb').read())) + with open(data_filename, 'rb') as fp0: + nodes1 = list(yaml.compose_all(fp0.read(), Loader=MyLoader)) + with open(path_filename, 'rb') as fp0: + nodes2 = list(yaml.compose_all(fp0.read())) try: for node1, node2 in zip(nodes1, nodes2): data1 = _convert_node(node1) @@ -78,11 +81,13 @@ test_path_resolver_loader.unittest = ['.data', '.path'] def test_path_resolver_dumper(data_filename, path_filename, verbose=False): _make_path_loader_and_dumper() for filename in [data_filename, path_filename]: - output = yaml.serialize_all(yaml.compose_all(open(filename, 'rb')), Dumper=MyDumper) + with open(filename, 'rb') as fp0: + output = yaml.serialize_all(yaml.compose_all(fp0), Dumper=MyDumper) if verbose: print(output) nodes1 = yaml.compose_all(output) - nodes2 = yaml.compose_all(open(data_filename, 'rb')) + with open(data_filename, 'rb') as fp0: + nodes2 = yaml.compose_all(fp0) for node1, node2 in zip(nodes1, nodes2): data1 = _convert_node(node1) data2 = _convert_node(node2) diff --git a/test/lib/test_structure.py b/test/lib/test_structure.py index 353d432..4f65926 100644 --- a/test/lib/test_structure.py +++ b/test/lib/test_structure.py @@ -38,9 +38,11 @@ def _convert_structure(loader): def test_structure(data_filename, structure_filename, verbose=False): nodes1 = [] - nodes2 = eval(open(structure_filename, 'r' if PY3 else 'rb').read()) + with open(structure_filename, 'r' if PY3 else 'rb') as fp: + nodes2 = eval(fp.read()) try: - loader = yaml.Loader(open(data_filename, 'rb')) + with open(data_filename, 'rb') as fp: + loader = yaml.Loader(fp) while loader.check_event(): if loader.check_event(yaml.StreamStartEvent, yaml.StreamEndEvent, yaml.DocumentStartEvent, yaml.DocumentEndEvent): @@ -75,8 +77,10 @@ def test_parser(data_filename, canonical_filename, verbose=False): events1 = None events2 = None try: - events1 = list(yaml.parse(open(data_filename, 'rb'))) - events2 = list(yaml.canonical_parse(open(canonical_filename, 'rb'))) + with open(data_filename, 'rb') as fp0: + events1 = list(yaml.parse(fp0)) + with open(canonical_filename, 'rb') as fp0: + events2 = list(yaml.canonical_parse(fp0)) _compare_events(events1, events2) finally: if verbose: @@ -91,8 +95,10 @@ def test_parser_on_canonical(canonical_filename, verbose=False): events1 = None events2 = None try: - events1 = list(yaml.parse(open(canonical_filename, 'rb'))) - events2 = list(yaml.canonical_parse(open(canonical_filename, 'rb'))) + with open(canonical_filename, 'rb') as fp0: + events1 = list(yaml.parse(fp0)) + with open(canonical_filename, 'rb') as fp0: + events2 = list(yaml.canonical_parse(fp0)) _compare_events(events1, events2, full=True) finally: if verbose: @@ -121,8 +127,10 @@ def test_composer(data_filename, canonical_filename, verbose=False): nodes1 = None nodes2 = None try: - nodes1 = list(yaml.compose_all(open(data_filename, 'rb'))) - nodes2 = list(yaml.canonical_compose_all(open(canonical_filename, 'rb'))) + with open(data_filename, 'rb') as fp0: + nodes1 = list(yaml.compose_all(fp0)) + with open(canonical_filename, 'rb') as fp0: + nodes2 = list(yaml.canonical_compose_all(fp0)) assert len(nodes1) == len(nodes2), (len(nodes1), len(nodes2)) for node1, node2 in zip(nodes1, nodes2): _compare_nodes(node1, node2) @@ -173,8 +181,10 @@ def test_constructor(data_filename, canonical_filename, verbose=False): native1 = None native2 = None try: - native1 = list(yaml.load_all(open(data_filename, 'rb'), Loader=MyLoader)) - native2 = list(yaml.load_all(open(canonical_filename, 'rb'), Loader=MyCanonicalLoader)) + with open(data_filename, 'rb') as fp0: + native1 = list(yaml.load_all(fp0, Loader=MyLoader)) + with open(canonical_filename, 'rb') as fp0: + native2 = list(yaml.load_all(fp0, Loader=MyCanonicalLoader)) assert native1 == native2, (native1, native2) finally: if verbose: diff --git a/test/lib/test_tokens.py b/test/lib/test_tokens.py index 23c9380..0b547e3 100644 --- a/test/lib/test_tokens.py +++ b/test/lib/test_tokens.py @@ -47,11 +47,14 @@ _replaces = { def test_tokens(data_filename, tokens_filename, verbose=False): tokens1 = [] - tokens2 = open(tokens_filename, 'r' if PY3 else 'rb').read().split() + with open(tokens_filename, 'r' if PY3 else 'rb') as fp: + tokens2 = fp.read().split() try: - for token in yaml.scan(open(data_filename, 'rb')): - if not isinstance(token, (yaml.StreamStartToken, yaml.StreamEndToken)): - tokens1.append(_replaces[token.__class__]) + with open(data_filename, 'rb') as fp1: + for token in yaml.scan(fp1): + if not isinstance( + token, (yaml.StreamStartToken, yaml.StreamEndToken)): + tokens1.append(_replaces[token.__class__]) finally: if verbose: print("TOKENS1:", ' '.join(tokens1)) @@ -66,8 +69,9 @@ def test_scanner(data_filename, canonical_filename, verbose=False): for filename in [data_filename, canonical_filename]: tokens = [] try: - for token in yaml.scan(open(filename, 'rb')): - tokens.append(token.__class__.__name__) + with open(filename, 'rb') as fp: + for token in yaml.scan(fp): + tokens.append(token.__class__.__name__) finally: if verbose: pprint.pprint(tokens) diff --git a/test/lib/test_yaml_ext.py b/test/lib/test_yaml_ext.py index aa7eaee..adfeb19 100644 --- a/test/lib/test_yaml_ext.py +++ b/test/lib/test_yaml_ext.py @@ -153,14 +153,18 @@ def _compare_scanners(py_data, c_data, verbose): pprint.pprint(c_tokens) def test_c_scanner(data_filename, canonical_filename, verbose=False): - _compare_scanners(open(data_filename, 'rb'), - open(data_filename, 'rb'), verbose) - _compare_scanners(open(data_filename, 'rb').read(), - open(data_filename, 'rb').read(), verbose) - _compare_scanners(open(canonical_filename, 'rb'), - open(canonical_filename, 'rb'), verbose) - _compare_scanners(open(canonical_filename, 'rb').read(), - open(canonical_filename, 'rb').read(), verbose) + with open(data_filename, 'rb') as fp0: + with open(data_filename, 'rb') as fp1: + _compare_scanners(fp0, fp1, verbose) + with open(data_filename, 'rb') as fp0: + with open(data_filename, 'rb') as fp1: + _compare_scanners(fp0.read(), fp1.read(), verbose) + with open(canonical_filename, 'rb') as fp0: + with open(canonical_filename, 'rb') as fp1: + _compare_scanners(fp0, fp1, verbose) + with open(canonical_filename, 'rb') as fp0: + with open(canonical_filename, 'rb') as fp1: + _compare_scanners(fp0.read(), fp1.read(), verbose) test_c_scanner.unittest = ['.data', '.canonical'] test_c_scanner.skip = ['.skip-ext'] @@ -186,14 +190,18 @@ def _compare_parsers(py_data, c_data, verbose): pprint.pprint(c_events) def test_c_parser(data_filename, canonical_filename, verbose=False): - _compare_parsers(open(data_filename, 'rb'), - open(data_filename, 'rb'), verbose) - _compare_parsers(open(data_filename, 'rb').read(), - open(data_filename, 'rb').read(), verbose) - _compare_parsers(open(canonical_filename, 'rb'), - open(canonical_filename, 'rb'), verbose) - _compare_parsers(open(canonical_filename, 'rb').read(), - open(canonical_filename, 'rb').read(), verbose) + with open(data_filename, 'rb') as fp0: + with open(data_filename, 'rb') as fp1: + _compare_parsers(fp0, fp1, verbose) + with open(data_filename, 'rb') as fp0: + with open(data_filename, 'rb') as fp1: + _compare_parsers(fp0.read(), fp1.read(), verbose) + with open(canonical_filename, 'rb') as fp0: + with open(canonical_filename, 'rb') as fp1: + _compare_parsers(fp0, fp1, verbose) + with open(canonical_filename, 'rb') as fp0: + with open(canonical_filename, 'rb') as fp1: + _compare_parsers(fp0.read(), fp1.read(), verbose) test_c_parser.unittest = ['.data', '.canonical'] test_c_parser.skip = ['.skip-ext'] @@ -231,8 +239,10 @@ def _compare_emitters(data, verbose): pprint.pprint(c_events) def test_c_emitter(data_filename, canonical_filename, verbose=False): - _compare_emitters(open(data_filename, 'rb').read(), verbose) - _compare_emitters(open(canonical_filename, 'rb').read(), verbose) + with open(data_filename, 'rb') as fp0: + _compare_emitters(fp0.read(), verbose) + with open(canonical_filename, 'rb') as fp0: + _compare_emitters(fp0.read(), verbose) test_c_emitter.unittest = ['.data', '.canonical'] test_c_emitter.skip = ['.skip-ext'] diff --git a/test/test_anchor.py b/test/test_anchor.py index e48398b..ae2ac59 100644 --- a/test/test_anchor.py +++ b/test/test_anchor.py @@ -136,18 +136,18 @@ class TestAnchorsAliases: - x: 1 y: 2 r: 10 - label: center/big + label: center/small # Merge one map - <<: *CENTER r: 10 - label: center/big + label: center/medium # Merge multiple maps - <<: [*CENTER, *BIG] label: center/big # Override - <<: [*BIG, *LEFT, *SMALL] x: 1 - label: center/big + label: center/huge """) def test_merge_00(self): @@ -156,7 +156,12 @@ class TestAnchorsAliases: ok = True for k in d: for o in [5, 6, 7]: - if d.get(k) != data[o].get(k): + x = d.get(k) + y = data[o].get(k) + if not isinstance(x, int): + x = x.split('/')[0] + y = y.split('/')[0] + if x != y: ok = False print('key', k, d.get(k), data[o].get(k)) assert ok diff --git a/test/test_z_data.py b/test/test_z_data.py index 1c4207f..a35bdbd 100644 --- a/test/test_z_data.py +++ b/test/test_z_data.py @@ -24,9 +24,6 @@ def test_data(): # @pytest.mark.skipif(not ruamel.yaml.__with_libyaml__, # reason="no libyaml") -@pytest.mark.skipif( - platform.python_implementation() == "PyPy", - reason="too many open filehandles, old PyYAML tests rely on garbage collection") def test_data_ext(): collections = [] if ruamel.yaml.__with_libyaml__: |