From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 31 Jan 2014 09:55:55 +0000 (+0100)
Subject: Issue #20452: Oops, fix debug code :-/
X-Git-Tag: v3.4.0rc1~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31f65044a977307915412edffddcb4962a8928a3;p=thirdparty%2FPython%2Fcpython.git

Issue #20452: Oops, fix debug code :-/

Add also event more debug info
---

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 4b3ecedd2293..4b8e3feefe71 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -627,11 +627,16 @@ class BaseEventLoop(events.AbstractEventLoop):
             t1 = self.time()
             # FIXME: remove these debug info (issue #20452)
             dt = t1-t0
-            if dt < timeout and not event_list:
-                print("WARNING: selector.select(timeout=%.20f) took dt=%.20f sec (dt-timeout=%+.20f)"
-                      % (timeout, dt, dt-timeout), file=sys.__stdout__)
-                print("WARNING: dt+%.20f > timeout? %s"
-                      % (self._granularity, (dt + self._granularity) > timeout), file=sys.__stdout__)
+            if timeout is not None:
+                if dt < timeout and not event_list:
+                    print("WARNING: selector.select(timeout=%.20f) took dt=%.20f sec (dt-timeout=%+.20f)"
+                          % (timeout, dt, dt-timeout), file=sys.__stdout__)
+                    print("WARNING: dt+%.20f > timeout? %s"
+                          % (self._granularity, (dt + self._granularity) > timeout), file=sys.__stdout__)
+            else:
+                if not event_list:
+                    print("WARNING: selector.select(timeout=%r) took dt=%.20f sec"
+                          % (timeout, dt), file=sys.__stdout__)
             if t1-t0 >= 1:
                 level = logging.INFO
             else:
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 4e02ee099568..aef4993f2858 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1160,6 +1160,7 @@ class EventLoopTestsMixin:
         # FIXME: remove this imports, used for debug purpose (issue #20452)
         import time
         import platform
+        import os
 
         def _run_once():
             self.loop._run_once_counter += 1
@@ -1181,11 +1182,16 @@ class EventLoopTestsMixin:
 
         self.loop.run_until_complete(wait())
         calls.append(self.loop._run_once_counter)
+        try:
+            SC_CLK_TCK = os.sysconf('SC_CLK_TCK')
+        except Exception:
+            SC_CLK_TCK = None
         self.assertEqual(calls, [1, 3, 5, 6],
                          # FIXME: remove these info, used for debug purpose (issue #20452)
                          (self.loop._granularity,
                           self.loop._selector.resolution,
                           time.get_clock_info('monotonic'),
+                          SC_CLK_TCK,
                           platform.platform()))