From ddd7c422fd89a053700f9ed5272cf732ccb09088 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@redhat.com>
Date: Tue, 8 Jan 2019 01:27:27 +0100
Subject: [PATCH] bpo-33717: pythoninfo logs information of all clocks
 (GH-11460)

test.pythoninfo now logs information of all clocks, not only time.time() and
time.perf_counter().
---
 Lib/test/pythoninfo.py                            | 15 ++++++++++++---
 .../2019-01-07-23-22-44.bpo-33717.GhHXv8.rst      |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Tests/2019-01-07-23-22-44.bpo-33717.GhHXv8.rst

diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 26bcf5f12d6636..7ce6bf7b1ab93f 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -6,6 +6,7 @@
 import re
 import sys
 import traceback
+import warnings
 
 
 def normalize_text(text):
@@ -380,9 +381,17 @@ def collect_time(info_add):
     copy_attributes(info_add, time, 'time.%s', attributes)
 
     if hasattr(time, 'get_clock_info'):
-        for clock in ('time', 'perf_counter'):
-            tinfo = time.get_clock_info(clock)
-            info_add('time.get_clock_info(%s)' % clock, tinfo)
+        for clock in ('clock', 'monotonic', 'perf_counter',
+                      'process_time', 'thread_time', 'time'):
+            try:
+                # prevent DeprecatingWarning on get_clock_info('clock')
+                with warnings.catch_warnings(record=True):
+                    clock_info = time.get_clock_info(clock)
+            except ValueError:
+                # missing clock like time.thread_time()
+                pass
+            else:
+                info_add('time.get_clock_info(%s)' % clock, clock_info)
 
 
 def collect_datetime(info_add):
diff --git a/Misc/NEWS.d/next/Tests/2019-01-07-23-22-44.bpo-33717.GhHXv8.rst b/Misc/NEWS.d/next/Tests/2019-01-07-23-22-44.bpo-33717.GhHXv8.rst
new file mode 100644
index 00000000000000..05338a329ef8b5
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-01-07-23-22-44.bpo-33717.GhHXv8.rst
@@ -0,0 +1,2 @@
+test.pythoninfo now logs information of all clocks, not only time.time() and
+time.perf_counter().