Skip to content

Commit

Permalink
[3.11] Reorder some test's decorators (GH-108804) (GH-108845)
Browse files Browse the repository at this point in the history
For example, do not demand the 'cpu' resource if the test cannot be run
due to non-working threads.
(cherry picked from commit 509bb61)

Co-authored-by: Serhiy Storchaka <[email protected]>
  • Loading branch information
miss-islington and serhiy-storchaka authored Sep 3, 2023
1 parent b30c83e commit ba47d87
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Lib/test/test_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -1459,8 +1459,8 @@ def test_read_all(self):

self.assertEqual(b"abcdefg", bufio.read())

@support.requires_resource('cpu')
@threading_helper.requires_working_threading()
@support.requires_resource('cpu')
def test_threads(self):
try:
# Write out many bytes with exactly the same number of 0's,
Expand Down Expand Up @@ -1834,8 +1834,8 @@ def test_truncate_after_write(self):
f.truncate()
self.assertEqual(f.tell(), buffer_size + 2)

@support.requires_resource('cpu')
@threading_helper.requires_working_threading()
@support.requires_resource('cpu')
def test_threads(self):
try:
# Write out many bytes from many threads and test they were
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_site.py
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,10 @@ def test_sitecustomize_executed(self):
else:
self.fail("sitecustomize not imported automatically")

@test.support.requires_resource('network')
@test.support.system_must_validate_cert
@unittest.skipUnless(hasattr(urllib.request, "HTTPSHandler"),
'need SSL support to download license')
@test.support.requires_resource('network')
@test.support.system_must_validate_cert
def test_license_exists_at_url(self):
# This test is a bit fragile since it depends on the format of the
# string displayed by license in the absence of a LICENSE file.
Expand Down

0 comments on commit ba47d87

Please sign in to comment.