From 34f11fdd83f211bbd459cc00488b90bc28500446 Mon Sep 17 00:00:00 2001 From: Paul Monson Date: Mon, 15 Apr 2019 18:11:39 -0700 Subject: [PATCH 1/6] fix WindowsLoadTracker exception on small windows --- Lib/test/libregrtest/main.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index 18ef6d0609cd63..74c66ee09193b3 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -626,8 +626,13 @@ def getloadavg_1m(): elif sys.platform == 'win32' and (self.ns.worker_args is None): from test.libregrtest.win_utils import WindowsLoadTracker - load_tracker = WindowsLoadTracker() - self.getloadavg = load_tracker.getloadavg + try: + load_tracker = WindowsLoadTracker() + self.getloadavg = load_tracker.getloadavg + except FileNotFoundError as error: + # typeperf.exe is not present on small editions + # of windows like Windows IoT Core or nanoserver + print ('Failed to create WindowsLoadTracker: {}'.format(str(error))) self.run_tests() self.display_result() From 0ff2620676528af12952075b284e1bd1ea7b7c64 Mon Sep 17 00:00:00 2001 From: Paul Monson Date: Mon, 15 Apr 2019 18:58:20 -0700 Subject: [PATCH 2/6] remove trailing space --- Lib/test/libregrtest/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index 74c66ee09193b3..3498ab305be67b 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -630,7 +630,7 @@ def getloadavg_1m(): load_tracker = WindowsLoadTracker() self.getloadavg = load_tracker.getloadavg except FileNotFoundError as error: - # typeperf.exe is not present on small editions + # typeperf.exe is not present on small editions # of windows like Windows IoT Core or nanoserver print ('Failed to create WindowsLoadTracker: {}'.format(str(error))) From 44d2be7bb51ded2f12e8efe0ca151a25ace8b3a9 Mon Sep 17 00:00:00 2001 From: Paul Monson Date: Tue, 16 Apr 2019 15:37:49 -0700 Subject: [PATCH 3/6] don't allocate tracker resources if typeperf not found --- Lib/test/libregrtest/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index 3498ab305be67b..dc6662107049dc 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -624,15 +624,15 @@ def getloadavg_1m(): return os.getloadavg()[0] self.getloadavg = getloadavg_1m elif sys.platform == 'win32' and (self.ns.worker_args is None): - from test.libregrtest.win_utils import WindowsLoadTracker + # Windows IoT Core and nanoserver do not provide + # typeperf.exe for x64, x86 or ARM + if os.path.isfile('c:/windows/system32/typeperf.exe'): + from test.libregrtest.win_utils import WindowsLoadTracker - try: load_tracker = WindowsLoadTracker() self.getloadavg = load_tracker.getloadavg - except FileNotFoundError as error: - # typeperf.exe is not present on small editions - # of windows like Windows IoT Core or nanoserver - print ('Failed to create WindowsLoadTracker: {}'.format(str(error))) + else: + print('Not using WinLoadTracker: typeperf.exe not found') self.run_tests() self.display_result() From 9bb35f210565537a4679f9dcb86d036f3ab70718 Mon Sep 17 00:00:00 2001 From: Paul Monson Date: Wed, 17 Apr 2019 16:07:36 -0700 Subject: [PATCH 4/6] Fix code review comments --- Lib/test/libregrtest/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index dc6662107049dc..b0af4fdf33d1fa 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -624,15 +624,15 @@ def getloadavg_1m(): return os.getloadavg()[0] self.getloadavg = getloadavg_1m elif sys.platform == 'win32' and (self.ns.worker_args is None): - # Windows IoT Core and nanoserver do not provide - # typeperf.exe for x64, x86 or ARM - if os.path.isfile('c:/windows/system32/typeperf.exe'): - from test.libregrtest.win_utils import WindowsLoadTracker + from test.libregrtest.win_utils import WindowsLoadTracker + try: load_tracker = WindowsLoadTracker() self.getloadavg = load_tracker.getloadavg - else: - print('Not using WinLoadTracker: typeperf.exe not found') + except FileNotFoundError as error: + # Windows IoT Core and Windows Nano Server do not provide + # typeperf.exe for x64, x86 or ARM + print ('Failed to create WindowsLoadTracker: {}'.format(str(error))) self.run_tests() self.display_result() From 84684b20a2dff63798d8a1ce938abee9868eec9e Mon Sep 17 00:00:00 2001 From: Paul Monson Date: Wed, 17 Apr 2019 16:09:39 -0700 Subject: [PATCH 5/6] remove space after print --- Lib/test/libregrtest/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index b0af4fdf33d1fa..9b4c34a6814510 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -632,7 +632,7 @@ def getloadavg_1m(): except FileNotFoundError as error: # Windows IoT Core and Windows Nano Server do not provide # typeperf.exe for x64, x86 or ARM - print ('Failed to create WindowsLoadTracker: {}'.format(str(error))) + print('Failed to create WindowsLoadTracker: {}'.format(str(error))) self.run_tests() self.display_result() From 5506a56281f0b4f29f26d86650edfacbb782975e Mon Sep 17 00:00:00 2001 From: Paul Monson Date: Wed, 17 Apr 2019 16:41:09 -0700 Subject: [PATCH 6/6] remove redundant str --- Lib/test/libregrtest/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index 9b4c34a6814510..d20e1746781f0a 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -632,7 +632,7 @@ def getloadavg_1m(): except FileNotFoundError as error: # Windows IoT Core and Windows Nano Server do not provide # typeperf.exe for x64, x86 or ARM - print('Failed to create WindowsLoadTracker: {}'.format(str(error))) + print('Failed to create WindowsLoadTracker: {}'.format(error)) self.run_tests() self.display_result()