10000 bpo-34060: Report system load when running test suite for Windows by ammaraskar · Pull Request #8357 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-34060: Report system load when running test suite for Windows #8357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 9, 2019
Merged

bpo-34060: Report system load when running test suite for Windows #8357

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ad86c2
bpo-34060: Report system load when running test suite for Windows
ammaraskar Jul 21, 2018
00a0895
Move windows specific code to its own file
ammaraskar Jul 25, 2018
5c0e275
Move imports to top of file
ammaraskar Jul 25, 2018
a8df864
Add comment explaining check in libregrtest
ammaraskar Feb 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add comment explaining check in libregrtest
  • Loading branch information
@ammaraskar
ammaraskar committed Feb 10, 2019
commit a8df864ce11df46a8632da9cfa55e3d53db1d856
26 changes: 13 additions & 13 deletions Lib/test/libregrtest/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,19 +586,6 @@ def main(self, tests=None, **kwargs):
self._main(tests, kwargs)

def _main(self, tests, kwargs):
self.ns = self.parse_args(kwargs)

self.getloadavg = None
if hasattr(os, 'getloadavg'):
def getloadavg_1m():
return os.getloadavg()[0]
self.getloadavg = getloadavg_1m
elif sys.platform == 'win32' and (self.ns.slaveargs is None):
from test.libregrtest.win_utils import WindowsLoadTracker

load_tracker = WindowsLoadTracker()
self.getloadavg = load_tracker.getloadavg

if self.ns.huntrleaks:
warmup, repetitions, _ = self.ns.huntrleaks
if warmup < 1 or repetitions < 1:
Expand Down Expand Up @@ -629,6 +616,19 @@ def getloadavg_1m():
self.list_cases()
sys.exit(0)

self.getloadavg = None
# If we're on windows and this is the parent runner (not a worker),
# report the load average.
if hasattr(os, 'getloadavg'):
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

load_tracker = WindowsLoadTracker()
self.getloadavg = load_tracker.getloadavg

self.run_tests()
self.display_result()

Expand Down
0