mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 19:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.11] gh-106016: Add Lib/test/test_module/ directory (GH-108293) (#108304)

Browse source 
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 adfc118fda)

Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
Miss Islington (bot) 2023-08-22 08:42:00 -07:00 • committed by GitHub
parent 8927cf0200
commit 5be32d8818
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Lib/test/test_module.py → Lib/test/test_module/__init__.py
View file

@ -126,8 +126,8 @@ a = A(destroyed)"""
self.assertIs(wr(), None) self.assertIs(wr(), None)
def test_module_getattr(self): def test_module_getattr(self):
import test.good_getattr as gga import test.test_module.good_getattr as gga
from test.good_getattr import test from test.test_module.good_getattr import test
self.assertEqual(test, "There is test") self.assertEqual(test, "There is test")
self.assertEqual(gga.x, 1) self.assertEqual(gga.x, 1)
self.assertEqual(gga.y, 2) self.assertEqual(gga.y, 2)
@ -135,46 +135,46 @@ a = A(destroyed)"""
"Deprecated, use whatever instead"): "Deprecated, use whatever instead"):
gga.yolo gga.yolo
self.assertEqual(gga.whatever, "There is whatever") 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): def test_module_getattr_errors(self):
import test.bad_getattr as bga import test.test_module.bad_getattr as bga
from test import bad_getattr2 from test.test_module import bad_getattr2
self.assertEqual(bga.x, 1) self.assertEqual(bga.x, 1)
self.assertEqual(bad_getattr2.x, 1) self.assertEqual(bad_getattr2.x, 1)
with self.assertRaises(TypeError): with self.assertRaises(TypeError):
bga.nope bga.nope
with self.assertRaises(TypeError): with self.assertRaises(TypeError):
bad_getattr2.nope bad_getattr2.nope
del sys.modules['test.bad_getattr'] del sys.modules['test.test_module.bad_getattr']
if 'test.bad_getattr2' in sys.modules: if 'test.test_module.bad_getattr2' in sys.modules:
del sys.modules['test.bad_getattr2'] del sys.modules['test.test_module.bad_getattr2']
def test_module_dir(self): 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']) 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): def test_module_dir_errors(self):
import test.bad_getattr as bga import test.test_module.bad_getattr as bga
from test import bad_getattr2 from test.test_module import bad_getattr2
with self.assertRaises(TypeError): with self.assertRaises(TypeError):
dir(bga) dir(bga)
with self.assertRaises(TypeError): with self.assertRaises(TypeError):
dir(bad_getattr2) dir(bad_getattr2)
del sys.modules['test.bad_getattr'] del sys.modules['test.test_module.bad_getattr']
if 'test.bad_getattr2' in sys.modules: if 'test.test_module.bad_getattr2' in sys.modules:
del sys.modules['test.bad_getattr2'] del sys.modules['test.test_module.bad_getattr2']
def test_module_getattr_tricky(self): def test_module_getattr_tricky(self):
from test import bad_getattr3 from test.test_module import bad_getattr3
# these lookups should not crash # these lookups should not crash
with self.assertRaises(AttributeError): with self.assertRaises(AttributeError):
bad_getattr3.one bad_getattr3.one
with self.assertRaises(AttributeError): with self.assertRaises(AttributeError):
bad_getattr3.delgetattr bad_getattr3.delgetattr
if 'test.bad_getattr3' in sys.modules: if 'test.test_module.bad_getattr3' in sys.modules:
del sys.modules['test.bad_getattr3'] del sys.modules['test.test_module.bad_getattr3']
def test_module_repr_minimal(self): def test_module_repr_minimal(self):
# reprs when modules have no __file__, __name__, or __loader__ # reprs when modules have no __file__, __name__, or __loader__

0
Lib/test/bad_getattr.py → Lib/test/test_module/bad_getattr.py
View file

0
Lib/test/bad_getattr2.py → Lib/test/test_module/bad_getattr2.py
View file

0
Lib/test/bad_getattr3.py → Lib/test/test_module/bad_getattr3.py
View file

0
Lib/test/good_getattr.py → Lib/test/test_module/good_getattr.py
View file

1
Makefile.pre.in
View file

@ -2012,6 +2012,7 @@ TESTSUBDIRS= ctypes/test \
test/test_importlib/zipdata01 \ test/test_importlib/zipdata01 \
test/test_importlib/zipdata02 \ test/test_importlib/zipdata02 \
test/test_json \ test/test_json \
test/test_module \
test/test_peg_generator \ test/test_peg_generator \
test/test_sqlite3 \ test/test_sqlite3 \
test/test_tomllib \ test/test_tomllib \