Test improvement: order-independent comparison, better cleanup.

For some reason the results are coming back out of order in python2.5
(select vs kqueue, maybe?)

diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py
index 55eb19120840f8fc2544d0c2ae0cefacdca96ef8..6db079c3eb79c111617ee8a72a070dfebfe15dc6 100644 (file)
--- a/tornado/test/simple_httpclient_test.py
+++ b/tornado/test/simple_httpclient_test.py
@@ -185,9 +185,16 @@ class SimpleHTTPClientTestCase(AsyncHTTPTestCase, LogTrapTestCase):
         self.triggers.popleft()()
         self.wait(condition=lambda: (len(self.triggers) == 2 and
                                      len(seen) == 2))
-        self.assertEqual(seen, [0, 1])
+        self.assertEqual(set(seen), set([0, 1]))
         self.assertEqual(len(client.queue), 0)
 
+        # Finish all the pending requests
+        self.triggers.popleft()()
+        self.triggers.popleft()()
+        self.wait(condition=lambda: len(seen) == 4)
+        self.assertEqual(set(seen), set([0, 1, 2, 3]))
+        self.assertEqual(len(self.triggers), 0)
+
     def test_follow_redirect(self):
         response = self.fetch("/countdown/2", follow_redirects=False)
         self.assertEqual(302, response.code)