Make test_roundtrip_*multiple tests more robust

This commit is contained in:
Jason Paryani
2015-01-28 16:13:13 -08:00
parent 88db4abc48
commit c6754f84d9

View File

@@ -57,8 +57,11 @@ def test_roundtrip_file_multiple(all_types):
msg.write(f) msg.write(f)
f.seek(0) f.seek(0)
i = 0
for msg in all_types.TestAllTypes.read_multiple(f): for msg in all_types.TestAllTypes.read_multiple(f):
test_regression.check_all_types(msg) test_regression.check_all_types(msg)
i += 1
assert i == 3
def test_roundtrip_bytes_multiple(all_types): def test_roundtrip_bytes_multiple(all_types):
msg = all_types.TestAllTypes.new_message() msg = all_types.TestAllTypes.new_message()
@@ -68,8 +71,11 @@ def test_roundtrip_bytes_multiple(all_types):
msgs += msg.to_bytes() msgs += msg.to_bytes()
msgs += msg.to_bytes() msgs += msg.to_bytes()
i = 0
for msg in all_types.TestAllTypes.read_multiple_bytes(msgs): for msg in all_types.TestAllTypes.read_multiple_bytes(msgs):
test_regression.check_all_types(msg) test_regression.check_all_types(msg)
i += 1
assert i == 3
def test_roundtrip_file_multiple_packed(all_types): def test_roundtrip_file_multiple_packed(all_types):
f = tempfile.TemporaryFile() f = tempfile.TemporaryFile()
@@ -80,8 +86,11 @@ def test_roundtrip_file_multiple_packed(all_types):
msg.write_packed(f) msg.write_packed(f)
f.seek(0) f.seek(0)
i = 0
for msg in all_types.TestAllTypes.read_multiple_packed(f): for msg in all_types.TestAllTypes.read_multiple_packed(f):
test_regression.check_all_types(msg) test_regression.check_all_types(msg)
i += 1
assert i == 3
def test_roundtrip_bytes_multiple_packed(all_types): def test_roundtrip_bytes_multiple_packed(all_types):
msg = all_types.TestAllTypes.new_message() msg = all_types.TestAllTypes.new_message()
@@ -91,8 +100,11 @@ def test_roundtrip_bytes_multiple_packed(all_types):
msgs += msg.to_bytes_packed() msgs += msg.to_bytes_packed()
msgs += msg.to_bytes_packed() msgs += msg.to_bytes_packed()
i = 0
for msg in all_types.TestAllTypes.read_multiple_bytes_packed(msgs): for msg in all_types.TestAllTypes.read_multiple_bytes_packed(msgs):
test_regression.check_all_types(msg) test_regression.check_all_types(msg)
i += 1
assert i == 3
def test_roundtrip_dict(all_types): def test_roundtrip_dict(all_types):
msg = all_types.TestAllTypes.new_message() msg = all_types.TestAllTypes.new_message()