From 0b5f99ad1af0892a2d6043abd8aeb10d685d3844 Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
<31488909+miss-islington@users.noreply.github.com>
Date: Thu, 17 Mar 2022 17:00:52 -0700
Subject: bpo-46421: Fix unittest filename evaluation when called as a module
(GH-30654)
(cherry picked from commit a0db11b10fca0fee6bb2b8d6277e266bad8c0fdb)
Co-authored-by: Bader Zaidan <bader@zaidan.pw>
---
Lib/test/test_cmd_line.py | 11 +++++++++++
Lib/unittest/main.py | 2 +-
Misc/ACKS | 1 +
.../next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst | 3 +++
4 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index d93e98f..d299f76 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -137,6 +137,17 @@ class CmdLineTest(unittest.TestCase):
self.assertTrue(data.find(b'1 loop') != -1)
self.assertTrue(data.find(b'__main__.Timer') != -1)
+ def test_relativedir_bug46421(self):
+ # Test `python -m unittest` with a relative directory beginning with ./
+ # Note: We have to switch to the project's top module's directory, as per
+ # the python unittest wiki. We will switch back when we are done.
+ defaultwd = os.getcwd()
+ projectlibpath = os.path.dirname(__file__).removesuffix("test")
+ with os_helper.change_cwd(projectlibpath):
+ # Testing with and without ./
+ assert_python_ok('-m', 'unittest', "test/test_longexp.py")
+ assert_python_ok('-m', 'unittest', "./test/test_longexp.py")
+
def test_run_code(self):
# Test expected operation of the '-c' switch
# Switch needs an argument
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index e62469a..88a188c 100644
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -39,7 +39,7 @@ def _convert_name(name):
name = rel_path
# on Windows both '\' and '/' are used as path
# separators. Better to replace both than rely on os.path.sep
- return name[:-3].replace('\\', '.').replace('/', '.')
+ return os.path.normpath(name)[:-3].replace('\\', '.').replace('/', '.')
return name
def _convert_names(names):
diff --git a/Misc/ACKS b/Misc/ACKS
index 7668caf..1f1364e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1983,6 +1983,7 @@ Masazumi Yoshikawa
Arnaud Ysmal
Bernard Yue
Moshe Zadka
+Bader Zaidan
Elias Zamaria
Milan Zamazal
Artur Zaprzala
diff --git a/Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst b/Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst
new file mode 100644
index 0000000..03ff27f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-01-18-01-29-38.bpo-46421.9LdmNr.rst
@@ -0,0 +1,3 @@
+Fix a unittest issue where if the command was invoked as ``python -m
+unittest`` and the filename(s) began with a dot (.), a ``ValueError`` is
+returned.
--
cgit v0.12