summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-08-22 15:42:00 (GMT)
committerGitHub <noreply@github.com>2023-08-22 15:42:00 (GMT)
commit5be32d88182f956f423a56c6250ce4020e8cd53c (patch)
treeed7f56dffa0a63f5bcd35fb539d5e7ac41b80505 /Lib
parent8927cf0200e56ebf74ed43f8c3fd724cd699ec22 (diff)
downloadcpython-5be32d88182f956f423a56c6250ce4020e8cd53c.zip
cpython-5be32d88182f956f423a56c6250ce4020e8cd53c.tar.gz
cpython-5be32d88182f956f423a56c6250ce4020e8cd53c.tar.bz2
[3.11] gh-106016: Add Lib/test/test_module/ directory (GH-108293) (#108304)
gh-106016: Add Lib/test/test_module/ directory (GH-108293) * Move Python scripts related to test_module to this new directory: good_getattr.py and bad_getattrX.py scripts. * Move Lib/test/test_module.py to Lib/test/test_module/__init__.py. (cherry picked from commit adfc118fdab66882599e01a84c22bd897055f3f1) Co-authored-by: Victor Stinner <vstinner@python.org>
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_module/__init__.py (renamed from Lib/test/test_module.py)36
-rw-r--r--Lib/test/test_module/bad_getattr.py (renamed from Lib/test/bad_getattr.py)0
-rw-r--r--Lib/test/test_module/bad_getattr2.py (renamed from Lib/test/bad_getattr2.py)0
-rw-r--r--Lib/test/test_module/bad_getattr3.py (renamed from Lib/test/bad_getattr3.py)0
-rw-r--r--Lib/test/test_module/good_getattr.py (renamed from Lib/test/good_getattr.py)0
5 files changed, 18 insertions, 18 deletions
diff --git a/Lib/test/test_module.py b/Lib/test/test_module/__init__.py
index f72177d..87d1a8e 100644
--- a/Lib/test/test_module.py
+++ b/Lib/test/test_module/__init__.py
@@ -126,8 +126,8 @@ a = A(destroyed)"""
self.assertIs(wr(), None)
def test_module_getattr(self):
- import test.good_getattr as gga
- from test.good_getattr import test
+ import test.test_module.good_getattr as gga
+ from test.test_module.good_getattr import test
self.assertEqual(test, "There is test")
self.assertEqual(gga.x, 1)
self.assertEqual(gga.y, 2)
@@ -135,46 +135,46 @@ a = A(destroyed)"""
"Deprecated, use whatever instead"):
gga.yolo
self.assertEqual(gga.whatever, "There is whatever")
- del sys.modules['test.good_getattr']
+ del sys.modules['test.test_module.good_getattr']
def test_module_getattr_errors(self):
- import test.bad_getattr as bga
- from test import bad_getattr2
+ import test.test_module.bad_getattr as bga
+ from test.test_module import bad_getattr2
self.assertEqual(bga.x, 1)
self.assertEqual(bad_getattr2.x, 1)
with self.assertRaises(TypeError):
bga.nope
with self.assertRaises(TypeError):
bad_getattr2.nope
- del sys.modules['test.bad_getattr']
- if 'test.bad_getattr2' in sys.modules:
- del sys.modules['test.bad_getattr2']
+ del sys.modules['test.test_module.bad_getattr']
+ if 'test.test_module.bad_getattr2' in sys.modules:
+ del sys.modules['test.test_module.bad_getattr2']
def test_module_dir(self):
- import test.good_getattr as gga
+ import test.test_module.good_getattr as gga
self.assertEqual(dir(gga), ['a', 'b', 'c'])
- del sys.modules['test.good_getattr']
+ del sys.modules['test.test_module.good_getattr']
def test_module_dir_errors(self):
- import test.bad_getattr as bga
- from test import bad_getattr2
+ import test.test_module.bad_getattr as bga
+ from test.test_module import bad_getattr2
with self.assertRaises(TypeError):
dir(bga)
with self.assertRaises(TypeError):
dir(bad_getattr2)
- del sys.modules['test.bad_getattr']
- if 'test.bad_getattr2' in sys.modules:
- del sys.modules['test.bad_getattr2']
+ del sys.modules['test.test_module.bad_getattr']
+ if 'test.test_module.bad_getattr2' in sys.modules:
+ del sys.modules['test.test_module.bad_getattr2']
def test_module_getattr_tricky(self):
- from test import bad_getattr3
+ from test.test_module import bad_getattr3
# these lookups should not crash
with self.assertRaises(AttributeError):
bad_getattr3.one
with self.assertRaises(AttributeError):
bad_getattr3.delgetattr
- if 'test.bad_getattr3' in sys.modules:
- del sys.modules['test.bad_getattr3']
+ if 'test.test_module.bad_getattr3' in sys.modules:
+ del sys.modules['test.test_module.bad_getattr3']
def test_module_repr_minimal(self):
# reprs when modules have no __file__, __name__, or __loader__
diff --git a/Lib/test/bad_getattr.py b/Lib/test/test_module/bad_getattr.py
index 16f901b..16f901b 100644
--- a/Lib/test/bad_getattr.py
+++ b/Lib/test/test_module/bad_getattr.py
diff --git a/Lib/test/bad_getattr2.py b/Lib/test/test_module/bad_getattr2.py
index 0a52a53..0a52a53 100644
--- a/Lib/test/bad_getattr2.py
+++ b/Lib/test/test_module/bad_getattr2.py
diff --git a/Lib/test/bad_getattr3.py b/Lib/test/test_module/bad_getattr3.py
index 0d5f926..0d5f926 100644
--- a/Lib/test/bad_getattr3.py
+++ b/Lib/test/test_module/bad_getattr3.py
diff --git a/Lib/test/good_getattr.py b/Lib/test/test_module/good_getattr.py
index 7d27de6..7d27de6 100644
--- a/Lib/test/good_getattr.py
+++ b/Lib/test/test_module/good_getattr.py