Skip to content

Commit 7764ddb

Browse files
authored
Make test insensitive to OrderedDict stringification (#1353)
Sometime between 3.9 and 3.12 the stringification of ordered dicts changed from using a list of tuples to a dictionary.
1 parent 07e9b9c commit 7764ddb

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

tests/test_flows/test_flow_functions.py

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import functools
66
import unittest
77
from collections import OrderedDict
8+
from multiprocessing.managers import Value
9+
810
from packaging.version import Version
911
from unittest import mock
1012
from unittest.mock import patch
@@ -195,27 +197,17 @@ def test_are_flows_equal_ignore_parameter_values(self):
195197

196198
new_flow = copy.deepcopy(flow)
197199
new_flow.parameters["a"] = 7
198-
self.assertRaisesRegex(
199-
ValueError,
200-
r"values for attribute 'parameters' differ: "
201-
r"'OrderedDict\(\[\('a', 5\), \('b', 6\)\]\)'\nvs\n"
202-
r"'OrderedDict\(\[\('a', 7\), \('b', 6\)\]\)'",
203-
openml.flows.functions.assert_flows_equal,
204-
flow,
205-
new_flow,
206-
)
200+
with pytest.raises(ValueError) as excinfo:
201+
openml.flows.functions.assert_flows_equal(flow, new_flow)
202+
assert str(paramaters) in str(excinfo.value) and str(new_flow.parameters) in str(excinfo.value)
203+
207204
openml.flows.functions.assert_flows_equal(flow, new_flow, ignore_parameter_values=True)
208205

209206
del new_flow.parameters["a"]
210-
self.assertRaisesRegex(
211-
ValueError,
212-
r"values for attribute 'parameters' differ: "
213-
r"'OrderedDict\(\[\('a', 5\), \('b', 6\)\]\)'\nvs\n"
214-
r"'OrderedDict\(\[\('b', 6\)\]\)'",
215-
openml.flows.functions.assert_flows_equal,
216-
flow,
217-
new_flow,
218-
)
207+
with pytest.raises(ValueError) as excinfo:
208+
openml.flows.functions.assert_flows_equal(flow, new_flow)
209+
assert str(paramaters) in str(excinfo.value) and str(new_flow.parameters) in str(excinfo.value)
210+
219211
self.assertRaisesRegex(
220212
ValueError,
221213
r"Flow Test: parameter set of flow differs from the parameters "

0 commit comments

Comments
 (0)