Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-93839: Move Lib/unttest/test/ to Lib/test/test_unittest/ #94043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 6 commits into from
Jun 21, 2022
Merged

gh-93839: Move Lib/unttest/test/ to Lib/test/test_unittest/ #94043

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0216f69
gh-93839: Move Lib/unttest/test/ to Lib/test/test_unittest/
vstinner Jun 20, 2022
e6f3a53
* Move Lib/unittest/test/ to Lib/test/test_unittest/
vstinner Jun 20, 2022
9320efc
* Replace unittest.test with test.test_unittest
vstinner Jun 20, 2022
917e6f5
* Remove unittest.load_tests()
vstinner Jun 20, 2022
34a8a1b
* Rewrite __init__.py and __main__.py
vstinner Jun 20, 2022
3e8a793
* Update build system, CODEOWNERS, wasm_assets.py
vstinner Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
* Rewrite __init__.py and __main__.py
  • Loading branch information
@vstinner
vstinner committed Jun 20, 2022
commit 34a8a1b6ed71a43c1a4670bf3141f4b88dae4f41
27 changes: 4 additions & 23 deletions Lib/test/test_unittest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
import os
import sys
import unittest
import os.path
from test.support import load_package_tests


here = os.path.dirname(__file__)
loader = unittest.defaultTestLoader

def suite():
suite = unittest.TestSuite()
for fn in os.listdir(here):
if fn.startswith("test") and fn.endswith(".py"):
modname = "test.test_unittest." + fn[:-3]
try:
__import__(modname)
except unittest.SkipTest:
continue
module = sys.modules[modname]
suite.addTest(loader.loadTestsFromModule(module))
suite.addTest(loader.loadTestsFromName('test.test_unittest.testmock'))
return suite


if __name__ == "__main__":
unittest.main(defaultTest="suite")
def load_tests(*args):
return load_package_tests(os.path.dirname(__file__), *args)
18 changes: 2 additions & 16 deletions Lib/test/test_unittest/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
import os
from . import load_tests
import unittest


def load_tests(loader, standard_tests, pattern):
# top level directory cached on loader instance
this_dir = os.path.dirname(__file__)
pattern = pattern or "test_*.py"
# We are inside test.test_unittest, so the top-level is two notches up
top_level_dir = os.path.dirname(os.path.dirname(this_dir))
package_tests = loader.discover(start_dir=this_dir, pattern=pattern,
top_level_dir=top_level_dir)
standard_tests.addTests(package_tests)
return standard_tests


if __name__ == '__main__':
unittest.main()
unittest.main()