8000 [3.7] bpo-33723: Remove busy loop from test_time (GH-10773) by miss-islington · Pull Request #10776 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.7] bpo-33723: Remove busy loop from test_time (GH-10773) #10776

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 1 commit into from
Nov 28, 2018
Merged

[3.7] bpo-33723: Remove busy loop from test_time (GH-10773) #10776

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 0 additions & 47 deletions Lib/test/test_time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ class _PyTime(enum.IntEnum):
)


def busy_wait(duration):
deadline = time.monotonic() + duration
while time.monotonic() < deadline:
pass


class TimeTestCase(unittest.TestCase):

def setUp(self):
Expand Down Expand Up @@ -496,25 +490,6 @@ def test_process_time(self):
# on Windows
self.assertLess(stop - start, 0.020)

# bpo-33723: A busy loop of 100 ms should increase process_time()
# by at least 15 ms. Tolerate 15 ms because of the bad resolution of
# the clock on Windows (around 15.6 ms).
min_time = 0.015
busy_time = 0.100

# process_time() should include CPU time spent in any thread
start = time.process_time()
busy_wait(busy_time)
stop = time.process_time()
self.assertGreaterEqual(stop - start, min_time)

t = threading.Thread(target=busy_wait, args=(busy_time,))
start = time.process_time()
t.start()
t.join()
stop = time.process_time()
self.assertGreaterEqual(stop - start, min_time)

info = time.get_clock_info('process_time')
self.assertTrue(info.monotonic)
self.assertFalse(info.adjustable)
Expand All @@ -535,28 +510,6 @@ def test_thread_time(self):
# on Windows
self.assertLess(stop - start, 0.020)

# bpo-33723: A busy loop of 100 ms should increase thread_time()
# by at least 15 ms, but less than 30 ms in other threads.
# Tolerate 15 and 30 ms because of the bad resolution
# of the clock on Windows (around 15.6 ms).
min_time = 0.015
max_time = 0.030
busy_time = 0.100

# thread_time() should include CPU time spent in current thread...
start = time.thread_time()
busy_wait(busy_time)
stop = time.thread_time()
self.assertGreaterEqual(stop - start, min_time)

# ...but not in other threads
t = threading.Thread(target=busy_wait, args=(busy_time,))
start = time.thread_time()
t.start()
t.join()
stop = time.thread_time()
self.assertLess(stop - start, max_time)

info = time.get_clock_info('thread_time')
self.assertTrue(info.monotonic)
self.assertFalse(info.adjustable)
Expand Down
0