From: Ben Darnell <ben@bendarnell.com>
Date: Thu, 24 Feb 2011 05:00:57 +0000 (-0800)
Subject: Test improvement:  order-independent comparison, better cleanup.
X-Git-Tag: v2.0.0~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8792d74f979d8910f4235607f9f30bdd382b38bb;p=thirdparty%2Ftornado.git

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 55eb19120..6db079c3e 100644
--- 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)