8000 gh-106016: Add Lib/test/test_module/ directory (#108293) · vstinner/cpython@adfc118 · GitHub
[go: up one dir, main page]
Skip to content

Commit adfc118

Browse files
vstinnervstinner
authored
pythongh-106016: Add Lib/test/test_module/ directory (python#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.
1 parent e8ef0bd commit adfc118

File tree

6 files changed

+19
-18
lines changed

6 files changed

+19
-18
lines changed

‎Lib/test/test_module.py renamed to ‎Lib/test/test_module/__init__.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -126,55 +126,55 @@ def test_weakref(self):
126126
self.assertIs(wr(), None)
127127

128128
def test_module_getattr(self):
129-
import test.good_getattr as gga
130-
from test.good_getattr import test
129+
import test.test_module.good_getattr as gga
130+
from test.test_module.good_getattr import test
131131
self.assertEqual(test, "There is test")
132132
self.assertEqual(gga.x, 1)
133133
self.assertEqual(gga.y, 2)
134134
with self.assertRaisesRegex(AttributeError,
135135
"Deprecated, use whatever instead"):
136136
gga.yolo
137137
self.assertEqual(gga.whatever, "There is whatever")
138-
del sys.modules['test.good_getattr']
138+
del sys.modules['test.test_module.good_getattr']
139139

140140
def test_module_getattr_errors(self):
141-
import test.bad_getattr as bga
142-
from test import bad_getattr2
141+
import test.test_module.bad_getattr as bga
142+
from test.test_module import bad_getattr2
143143
self.assertEqual(bga.x, 1)
144144
self.assertEqual(bad_getattr2.x, 1)
145145
with self.assertRaises(TypeError):
146146
bga.nope
147147
with self.assertRaises(TypeError):
148148
bad_getattr2.nope
149-
del sys.modules['test.bad_getattr']
150-
if 'test.bad_getattr2' in sys.modules:
151-
del sys.modules['test.bad_getattr2']
149+
del sys.modules['test.test_module.bad_getattr']
150+
if 'test.test_module.bad_getattr2' in sys.modules:
151+
del sys.modules['test.test_module.bad_getattr2']
152152

153153
def test_module_dir(self):
154-
import test.good_getattr as gga
154+
import test.test_module.good_getattr as gga
155155
self.assertEqual(dir(gga), ['a', 'b', 'c'])
156-
del sys.modules['test.good_getattr']
156+
del sys.modules['test.test_module.good_getattr']
157157

158158
def test_module_dir_errors(self):
159-
import test.bad_getattr as bga
160-
from test import bad_getattr2
159+
import test.test_module.bad_getattr as bga
160+
from test.test_module import bad_getattr2
161161
with self.assertRaises(TypeError):
162162
dir(bga)
163163
with self.assertRaises(TypeError):
164164
dir(bad_getattr2)
165-
del sys.modules['test.bad_getattr']
166-
if 'test.bad_getattr2' in sys.modules:
167-
del sys.modules['test.bad_getattr2']
165+
del sys.modules['test.test_module.bad_getattr']
166+
if 'test.test_module.bad_getattr2' in sys.modules:
167+
del sys.modules['test.test_module.bad_getattr2']
168168

169169
def test_module_getattr_tricky(self):
170-
from test import bad_getattr3
170+
from test.test_module import bad_getattr3
171171
# these lookups should not crash
172172
with self.assertRaises(AttributeError):
173173
bad_getattr3.one
174174
with self.assertRaises(AttributeError):
175175
bad_getattr3.delgetattr
176-
if 'test.bad_getattr3' in sys.modules:
177-
del sys.modules['test.bad_getattr3']
176+
if 'test.test_module.bad_getattr3' in sys.modules:
177+
del sys.modules['test.test_module.bad_getattr3']
178178

179179
def test_module_repr_minimal(self):
180180
# reprs when modules have no __file__, __name__, or __loader__

‎Lib/test/bad_getattr.py renamed to ‎Lib/test/test_module/bad_getattr.py

File renamed without changes.

‎Lib/test/bad_getattr2.py renamed to ‎Lib/test/test_module/bad_getattr2.py

File renamed without changes.

‎Lib/test/bad_getattr3.py renamed to ‎Lib/test/test_module/bad_getattr3.py

File renamed without changes.

‎Lib/test/good_getattr.py renamed to ‎Lib/test/test_module/good_getattr.py

File renamed without changes.

‎Makefile.pre.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2212,6 +2212,7 @@ TESTSUBDIRS= idlelib/idle_test \
22122212
test/test_importlib/resources/zipdata02 \
22132213
test/test_importlib/source \
22142214
test/test_json \
2215+
test/test_module \
22152216
test/test_peg_generator \
22162217
test/test_sqlite3 \
22172218
test/test_tkinter \

0 commit comments

Comments
 (0)
0