]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-99892: test_unicodedata: skip test on download failure (GH-100011)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Mon, 5 Dec 2022 16:07:00 +0000 (08:07 -0800)
committerGitHub <noreply@github.com>
Mon, 5 Dec 2022 16:07:00 +0000 (08:07 -0800)
Skip test_normalization() of test_unicodedata if it fails to download
NormalizationTest.txt file from pythontest.net.
(cherry picked from commit 2488c1e1b66366a3a933ff248eff080fabd2351c)

Co-authored-by: Victor Stinner <vstinner@python.org>
Lib/test/test_unicodedata.py
Misc/NEWS.d/next/Tests/2022-12-05-16-12-56.gh-issue-99892.sz_eW8.rst [new file with mode: 0644]

index 85a3c2d6d5442b9ecb2f8f799bc075965130b214..9e0097c892e7f76c448aa67ce92960b5968a20f3 100644 (file)
@@ -12,7 +12,8 @@ import sys
 import unicodedata
 import unittest
 from test.support import (open_urlresource, requires_resource, script_helper,
-                          cpython_only, check_disallow_instantiation)
+                          cpython_only, check_disallow_instantiation,
+                          ResourceDenied)
 
 
 class UnicodeMethodsTest(unittest.TestCase):
@@ -345,8 +346,8 @@ class NormalizationTest(unittest.TestCase):
         except PermissionError:
             self.skipTest(f"Permission error when downloading {TESTDATAURL} "
                           f"into the test data directory")
-        except (OSError, HTTPException):
-            self.fail(f"Could not retrieve {TESTDATAURL}")
+        except (OSError, HTTPException) as exc:
+            self.skipTest(f"Failed to download {TESTDATAURL}: {exc}")
 
         with testdata:
             self.run_normalization_tests(testdata)
diff --git a/Misc/NEWS.d/next/Tests/2022-12-05-16-12-56.gh-issue-99892.sz_eW8.rst b/Misc/NEWS.d/next/Tests/2022-12-05-16-12-56.gh-issue-99892.sz_eW8.rst
new file mode 100644 (file)
index 0000000..eded036
--- /dev/null
@@ -0,0 +1,2 @@
+Skip test_normalization() of test_unicodedata if it fails to download
+NormalizationTest.txt file from pythontest.net. Patch by Victor Stinner.