[Python-checkins] cpython: sched.py: fix test_queue by making sure that queue property returns an orderd

[giampaolo.rodola]

http://hg.python.org/cpython/rev/fb5e78e0539c
changeset:   73757:fb5e78e0539c
user:        Giampaolo Rodola' <g.rodola at gmail.com>
date:        Sat Nov 26 12:17:42 2011 +0100
summary:
  sched.py: fix test_queue by making sure that queue property returns an orderd list of upcoming events

files:
  Lib/test/test_sched.py |  15 ++++++++-------
  1 files changed, 8 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_sched.py b/Lib/test/test_sched.py
--- a/Lib/test/test_sched.py
+++ b/Lib/test/test_sched.py
@@ -62,15 +62,16 @@
 
     def test_queue(self):
         l = []
-        events = []
         fun = lambda x: l.append(x)
         scheduler = sched.scheduler(time.time, time.sleep)
-        self.assertEqual(scheduler._queue, [])
-        for x in [0.05, 0.04, 0.03, 0.02, 0.01]:
-            events.append(scheduler.enterabs(x, 1, fun, (x,)))
-        self.assertEqual(scheduler._queue.sort(), events.sort())
-        scheduler.run()
-        self.assertEqual(scheduler._queue, [])
+        e5 = scheduler.enter(0.05, 1, fun)
+        e1 = scheduler.enter(0.01, 1, fun)
+        e2 = scheduler.enter(0.02, 1, fun)
+        e4 = scheduler.enter(0.04, 1, fun)
+        e3 = scheduler.enter(0.03, 1, fun)
+        # queue property is supposed to return an order list of
+        # upcoming events
+        self.assertEqual(list(scheduler.queue), [e1, e2, e3, e4, e5])
 
     def test_args_kwargs(self):
         flag = []

-- 
Repository URL: http://hg.python.org/cpython