Skip to content

Commit 79e335e

Browse files
committed
split incomplete serializer/deserializer in test_shelve
1 parent 306e43d commit 79e335e

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

Lib/test/test_shelve.py

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,21 +224,25 @@ def deserializer(data):
224224
s["array_data"], array_data.tobytes().decode()
225225
)
226226

227-
def test_custom_incomplete_serializer_and_deserializer(self):
227+
def test_custom_incomplete_serializer(self):
228228
os.mkdir(self.dirname)
229229
self.addCleanup(os_helper.rmtree, self.dirname)
230230

231-
with self.assertRaises((TypeError, dbm.error)):
232-
def serializer(obj, protocol=None):
233-
pass
231+
def serializer(obj, protocol=None):
232+
pass
234233

235-
def deserializer(data):
236-
return data.decode("utf-8")
234+
def deserializer(data):
235+
return data.decode("utf-8")
237236

237+
with self.assertRaises((TypeError, dbm.error)):
238238
with shelve.open(self.fn, serializer=serializer,
239239
deserializer=deserializer) as s:
240240
s["foo"] = "bar"
241241

242+
def test_custom_incomplete_deserializer(self):
243+
os.mkdir(self.dirname)
244+
self.addCleanup(os_helper.rmtree, self.dirname)
245+
242246
def serializer(obj, protocol=None):
243247
return type(obj).__name__.encode("utf-8")
244248

@@ -353,7 +357,7 @@ def type_name_len(obj):
353357
self.assertEqual(s["bytearray_data"], "bytearray")
354358
self.assertEqual(s["array_data"], "array")
355359

356-
def test_custom_incomplete_serializer_and_deserializer_bsd_db_shelf(self):
360+
def test_custom_incomplete_deserializer_bsd_db_shelf(self):
357361
berkeleydb = import_helper.import_module("berkeleydb")
358362
os.mkdir(self.dirname)
359363
self.addCleanup(os_helper.rmtree, self.dirname)
@@ -371,6 +375,11 @@ def deserializer(data):
371375
self.assertIsNone(s["foo"])
372376
self.assertNotEqual(s["foo"], "bar")
373377

378+
def test_custom_incomplete_serializer_bsd_db_shelf(self):
379+
berkeleydb = import_helper.import_module("berkeleydb")
380+
os.mkdir(self.dirname)
381+
self.addCleanup(os_helper.rmtree, self.dirname)
382+
374383
def serializer(obj, protocol=None):
375384
pass
376385

0 commit comments

Comments
 (0)