From ba47d872824212ff87ee6f62f4ae15b65ebb8a53 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sun, 3 Sep 2023 06:01:49 -0700 Subject: [3.11] Reorder some test's decorators (GH-108804) (GH-108845) For example, do not demand the 'cpu' resource if the test cannot be run due to non-working threads. (cherry picked from commit 509bb61977cc8a4487efd3f9cdd63d9f7b86be62) Co-authored-by: Serhiy Storchaka --- Lib/test/test_io.py | 4 ++-- Lib/test/test_site.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 79aa2da..0a5f82a 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -1459,8 +1459,8 @@ class BufferedReaderTest(unittest.TestCase, CommonBufferedTests): 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, @@ -1834,8 +1834,8 @@ class BufferedWriterTest(unittest.TestCase, CommonBufferedTests): 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 diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index b5dc381..12a2b73 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -466,10 +466,10 @@ class ImportSideEffectTests(unittest.TestCase): 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. -- cgit v0.12