From 50357de5758444405cec05cb3aa01a843d15b09f Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Wed, 26 Apr 2017 16:08:55 -0700 Subject: [PATCH] Fix sporadic failure in TestObjectController.test_container_update_async Change-Id: Ie4d58626ebe97049703802a43c669cc78cf60f8b Related-Change: I15f36e191cfe3ee6c82b4be56e8618ec0230e328 Closes-Bug: #1589994 --- test/unit/obj/test_server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/unit/obj/test_server.py b/test/unit/obj/test_server.py index 7e41d806f2..72fda34e9f 100644 --- a/test/unit/obj/test_server.py +++ b/test/unit/obj/test_server.py @@ -5168,7 +5168,9 @@ class TestObjectController(unittest.TestCase): diskfile_mgr.pickle_async_update = fake_pickle_async_update with mocked_http_conn(500) as fake_conn, fake_spawn(): resp = req.get_response(self.object_controller) - self.assertRaises(StopIteration, fake_conn.code_iter.next) + # fake_spawn() above waits on greenthreads to finish; + # don't start making assertions until then + self.assertRaises(StopIteration, fake_conn.code_iter.next) self.assertEqual(resp.status_int, 201) self.assertEqual(len(given_args), 7) (objdevice, account, container, obj, data, timestamp,