Skip to content

Commit 95baa4c

Browse files
committed
Fix TestPickling not being executed in unit tests
1 parent 1d780e8 commit 95baa4c

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

tests/test_ontology.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ def test_edit_relationship(self):
101101
self.assertEqual(ont._relationships.lineage, {r1.id: Lineage(), r2.id: Lineage()})
102102

103103

104-
class TestPickling(object):
104+
class TestPickling(unittest.TestCase):
105105
@classmethod
106106
def setUpClass(cls):
107107
warnings.simplefilter('error')
108108
warnings.simplefilter('ignore', category=UnicodeWarning)
109109
with open(os.path.join(DATADIR, "ms.obo"), "rb") as f:
110-
cls.ms = pronto.Ontology(cls.file)
110+
cls.ms = pronto.Ontology(f)
111111

112112
@classmethod
113113
def tearDownClass(cls):
@@ -142,13 +142,10 @@ def test_memory_pickling_5(self):
142142
def _test_file_pickling(self, protocol):
143143
pickled = pickle.dumps(self.ms, protocol=protocol)
144144
unpickled = pickle.loads(pickled)
145-
self.assertEqual(self.ms.keys(), unpickled.keys())
146-
for key in self.ms.keys():
147-
term_ms, term_pickled = self.ms[key]._data(), unpickled[key]._data()
148-
for attr in term_ms.__annotations__:
149-
attr_ms = getattr(term_ms, attr)
150-
attr_pickled = getattr(term_pickled, attr)
151-
self.assertEqual(attr_ms, attr_pickled)
145+
self.assertEqual(list(self.ms.keys()), list(unpickled.keys()))
146+
for key in self.ms.terms():
147+
term_ms, term_pickled = self.ms.get_term(key.id)._data(), unpickled.get_term(key.id)._data()
148+
self.assertEqual(term_ms, term_pickled)
152149

153150
def test_file_pickling_3(self):
154151
self._test_file_pickling(3)

0 commit comments

Comments
 (0)