openstack/swift
Code Issues Proposed changes

Improve test_utils.TestCloseableChain

Browse Source 
Add assertions with a generator in the CloseableChain.

Co-Authored-By: Tim Burke <tim.burke@gmail.com>
Change-Id: Ifd4aea2b9f97a94dd73bede8918e40b6a4bc2f11
This commit is contained in:
Alistair Coles 2020-12-30 10:43:05 +00:00
parent 5e33026495
commit d64522a68f
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/unit/common/test_utils.py
View File

@ -8836,3 +8836,32 @@ class TestCloseableChain(unittest.TestCase):
chain = utils.CloseableChain([1, 2], [3])
chain.close()
self.assertEqual([1, 2, 3], [x for x in chain])
# check with generator in the chain
generator_closed = [False]
def gen():
try:
yield 2
yield 3
except GeneratorExit:
generator_closed[0] = True
raise
test_iter1 = FakeIterable([1])
chain = utils.CloseableChain(test_iter1, gen())
self.assertEqual(0, test_iter1.close_call_count)
self.assertFalse(generator_closed[0])
chain.close()
self.assertEqual(1, test_iter1.close_call_count)
# Generator never kicked off, so there's no GeneratorExit
self.assertFalse(generator_closed[0])
test_iter1 = FakeIterable([1])
chain = utils.CloseableChain(gen(), test_iter1)
self.assertEqual(2, next(chain)) # Kick off the generator
self.assertEqual(0, test_iter1.close_call_count)
self.assertFalse(generator_closed[0])
chain.close()
self.assertEqual(1, test_iter1.close_call_count)
self.assertTrue(generator_closed[0])