summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Schemenauer <nas-github@arctrix.com>2021-02-21 23:24:41 (GMT)
committerGitHub <noreply@github.com>2021-02-21 23:24:41 (GMT)
commit44fe32061d60f4bd9c4fa48c24e3e4ba26033dba (patch)
tree4997920b65fd987b7b8bc44796ca5e23168b6593
parent693aeacf8851d1e9995073e27e50644a505dc49c (diff)
downloadcpython-44fe32061d60f4bd9c4fa48c24e3e4ba26033dba.zip
cpython-44fe32061d60f4bd9c4fa48c24e3e4ba26033dba.tar.gz
cpython-44fe32061d60f4bd9c4fa48c24e3e4ba26033dba.tar.bz2
[3.9] bpo-43288: Fix bug in test_importlib test. (GH-24616)
* bpo-43288: Fix bug in test_importlib test. (GH-24612) * Fix failed merge of bpo-43288. (GH-24614)
-rw-r--r--Lib/test/test_importlib/fixtures.py4
-rw-r--r--Misc/NEWS.d/next/Tests/2021-02-21-11-11-53.bpo-43288.LfTvL-.rst2
2 files changed, 6 insertions, 0 deletions
diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/fixtures.py
index 2e55d14..d71f264 100644
--- a/Lib/test/test_importlib/fixtures.py
+++ b/Lib/test/test_importlib/fixtures.py
@@ -5,6 +5,7 @@ import pathlib
import tempfile
import textwrap
import contextlib
+import unittest
@contextlib.contextmanager
@@ -220,6 +221,9 @@ class FileBuilder:
return test.support.FS_NONASCII or \
self.skip("File system does not support non-ascii.")
+ def skip(self, reason):
+ raise unittest.SkipTest(reason)
+
def DALS(str):
"Dedent and left-strip"
diff --git a/Misc/NEWS.d/next/Tests/2021-02-21-11-11-53.bpo-43288.LfTvL-.rst b/Misc/NEWS.d/next/Tests/2021-02-21-11-11-53.bpo-43288.LfTvL-.rst
new file mode 100644
index 0000000..8463540
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-02-21-11-11-53.bpo-43288.LfTvL-.rst
@@ -0,0 +1,2 @@
+Fix test_importlib to correctly skip Unicode file tests if the fileystem
+does not support them.