[3.12] gh-106016: Add Lib/test/test_module/ directory (#108293) (#108306)

gh-106016: Add Lib/test/test_module/ directory (#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 adfc118fda)
This commit is contained in:
Victor Stinner 2023-08-22 22:06:07 +02:00 committed by GitHub
parent fad80598dc
commit ca47a2183a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 18 deletions

View file

@ -126,8 +126,8 @@ def test_weakref(self):
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 @@ def test_module_getattr(self):
"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__

View file

@ -2192,6 +2192,7 @@ TESTSUBDIRS= idlelib/idle_test \
test/test_lib2to3/data \
test/test_lib2to3/data/fixers \
test/test_lib2to3/data/fixers/myfixes \
test/test_module \
test/test_peg_generator \
test/test_sqlite3 \
test/test_tkinter \