Skip to content

bpo-10572: Move test sub-packages to Lib/test #18524

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

Closed
idomic wants to merge 30 commits into from
Closed

bpo-10572: Move test sub-packages to Lib/test #18524

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
13c5b05
Hard reset + cherry piciking the changes.
idomic Feb 11, 2020
fdecdf0
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 11, 2020
29d13c9
Added @vstinner News
idomic Feb 12, 2020
135259f
Update Misc/NEWS.d/next/Library/2020-02-11-13-01-38.bpo-38691.oND8Sk.rst
idomic Feb 13, 2020
794b948
Merge branch 'master' of https://github.com/python/cpython
idomic Feb 15, 2020
bfa3cd1
Merge branch 'master' of https://github.com/python/cpython
idomic Feb 16, 2020
36b41eb
[bpo-10572] Moved tests of these modules under Lib/tests/MODULE_NAME_…
idomic Feb 16, 2020
69ad225
[bpo-10572] Changing test references for CI
idomic Feb 16, 2020
8e7db7a
[bpo-10572] Adapting tests imports
idomic Feb 16, 2020
71b4de5
Merge branch 'master' of https://github.com/python/cpython
idomic Feb 16, 2020
4be42f0
Removed residues
idomic Feb 16, 2020
4a3cf9f
Merge branch 'master' into bpo-10572-reArranging_Lib_tests
idomic Feb 16, 2020
18c5f36
[bpo-10572] Changed Makefile.pre.in to contain the correct tests path
idomic Feb 16, 2020
60a14df
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 16, 2020
fbd63a8
[bpo-10572] Changed Makefile.pre.in to contain the correct tests path
idomic Feb 16, 2020
e3ff1cd
Merge remote-tracking branch 'origin/bpo-10572-reArranging_Lib_tests'…
idomic Feb 16, 2020
bb4e8b8
[bpo-10572] Changed Makefile.pre.in to contain the correct tests path
idomic Feb 16, 2020
65db1d2
[bpo-10572] Fixing distutils tests path
idomic Feb 16, 2020
7cfa472
[bpo-10572] Fixing Lib.test.tkinter_test tests path
idomic Feb 16, 2020
fd7ed2b
[bpo-10572] Fixing Lib.test.unittest_test + ctypes tests path
idomic Feb 16, 2020
6b32dd1
[bpo-10572] Fixing Lib.test.unittest_test + test_lib2to3 tests path
idomic Feb 17, 2020
1021fcf
[bpo-10572] Fixing Lib.test.unittest_test + test_lib2to3 tests path
idomic Feb 17, 2020
f5431d8
[bpo-10572] Fixed hardcoded Lib.test.unittest_test and lib2to3 path
idomic Feb 17, 2020
d89915f
[bpo-10572] Fixed hardcoded Lib.test.unittest_test and lib2to3 path
idomic Feb 17, 2020
a5e9500
[bpo-10572] Fixed hardcoded Lib.test.unittest_test and lib2to3 path
idomic Feb 17, 2020
19ab4cd
[bpo-10572] Fixed hardcoded Lib.test.unittest_test and lib2to3 path
idomic Feb 17, 2020
1010154
[bpo-10572] Fixed hardcoded Lib.test.unittest_test and lib2to3 path
idomic Feb 17, 2020
e65b43c
[bpo-10572] Fixed hardcoded Lib.test.unittest_test and lib2to3 path
idomic Feb 17, 2020
4609963
[bpo-10572] Fixed hardcoded Lib.test.unittest_test and lib2to3 path
idomic Feb 17, 2020
c552264
[bpo-10572] Fixed hardcoded Lib.test.unittest_test and lib2to3 path
idomic Feb 17, 2020
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
[bpo-10572] Fixed hardcoded Lib.test.unittest_test and lib2to3 path
  • Loading branch information
@idomic
idomic committed Feb 17, 2020
commit e65b43c0794d1e62fd2737258cf61ec2fdb5fc65
47 changes: 24 additions & 23 deletions Lib/test/unittest_test/test_program.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
import sys
import subprocess
from test import support
import unittest
import Lib.test.unittest_test as unittest_test


class Test_TestProgram(unittest_test.TestCase):
class Test_TestProgram(unittest.TestCase):

def test_discovery_from_dotted_path(self):
loader = unittest_test.TestLoader()
loader = unittest.TestLoader()

tests = [self]
expectedPath = os.path.abspath(os.path.dirname(unittest_test.__file__))
Expand All @@ -37,30 +38,30 @@ def run(self, test):

runner = FakeRunner()

oldParseArgs = unittest_test.TestProgram.parseArgs
oldParseArgs = unittest.TestProgram.parseArgs
def restoreParseArgs():
unittest_test.TestProgram.parseArgs = oldParseArgs
unittest_test.TestProgram.parseArgs = lambda *args: None
unittest.TestProgram.parseArgs = oldParseArgs
unittest.TestProgram.parseArgs = lambda *args: None
self.addCleanup(restoreParseArgs)

def removeTest():
del unittest_test.TestProgram.test
unittest_test.TestProgram.test = test
del unittest.TestProgram.test
unittest.TestProgram.test = test
self.addCleanup(removeTest)

program = unittest_test.TestProgram(testRunner=runner, exit=False, verbosity=2)
program = unittest.TestProgram(testRunner=runner, exit=False, verbosity=2)

self.assertEqual(program.result, result)
self.assertEqual(runner.test, test)
self.assertEqual(program.verbosity, 2)

class FooBar(unittest_test.TestCase):
class FooBar(unittest.TestCase):
def testPass(self):
assert True
def testFail(self):
assert False

class FooBarLoader(unittest_test.TestLoader):
class FooBarLoader(unittest.TestLoader):
"""Test loader that returns a suite containing FooBar."""
def loadTestsFromModule(self, module):
return self.suiteClass(
Expand All @@ -79,7 +80,7 @@ def run(self, test):
old_argv = sys.argv
sys.argv = ['faketest']
runner = FakeRunner()
program = unittest_test.TestProgram(testRunner=runner, exit=False,
program = unittest.TestProgram(testRunner=runner, exit=False,
defaultTest='Lib.test.unittest_test',
testLoader=self.FooBarLoader())
sys.argv = old_argv
Expand All @@ -94,7 +95,7 @@ def run(self, test):
old_argv = sys.argv
sys.argv = ['faketest']
runner = FakeRunner()
program = unittest_test.TestProgram(
program = unittest.TestProgram(
testRunner=runner, exit=False,
defaultTest=['Lib.test.unittest_test', 'unittest.test2'],
testLoader=self.FooBarLoader())
Expand All @@ -103,40 +104,40 @@ def run(self, test):
program.testNames)

def test_NonExit(self):
program = unittest_test.main(exit=False,
program = unittest.main(exit=False,
argv=["foobar"],
testRunner=unittest_test.TextTestRunner(stream=io.StringIO()),
testRunner=unittest.TextTestRunner(stream=io.StringIO()),
testLoader=self.FooBarLoader())
self.assertTrue(hasattr(program, 'result'))


def test_Exit(self):
self.assertRaises(
SystemExit,
unittest_test.main,
unittest.main,
argv=["foobar"],
testRunner=unittest_test.TextTestRunner(stream=io.StringIO()),
testRunner=unittest.TextTestRunner(stream=io.StringIO()),
exit=True,
testLoader=self.FooBarLoader())


def test_ExitAsDefault(self):
self.assertRaises(
SystemExit,
unittest_test.main,
unittest.main,
argv=["foobar"],
testRunner=unittest_test.TextTestRunner(stream=io.StringIO()),
testRunner=unittest.TextTestRunner(stream=io.StringIO()),
testLoader=self.FooBarLoader())


class InitialisableProgram(unittest_test.TestProgram):
class InitialisableProgram(unittest.TestProgram):
exit = False
result = None
verbosity = 1
defaultTest = None
tb_locals = False
testRunner = None
testLoader = unittest_test.defaultTestLoader
testLoader = unittest.defaultTestLoader
module = '__main__'
progName = 'test'
test = 'test'
Expand All @@ -161,7 +162,7 @@ def run(self, test):
return RESULT


class TestCommandLineArgs(unittest_test.TestCase):
class TestCommandLineArgs(unittest.TestCase):

def setUp(self):
self.program = InitialisableProgram()
Expand Down Expand Up @@ -226,7 +227,7 @@ def testBufferCatchFailfast(self):
def testWarning(self):
"""Test the warnings argument"""
# see #10535
class FakeTP(unittest_test.TestProgram):
class FakeTP(unittest.TestProgram):
def parseArgs(self, *args, **kw): pass
def runTests(self, *args, **kw): pass
warnoptions = sys.warnoptions[:]
Expand Down Expand Up @@ -311,7 +312,7 @@ def testRunTestsOldRunnerClass(self):
self.assertIs(program.result, RESULT)

def testCatchBreakInstallsHandler(self):
module = sys.modules['unittest_test.main']
module = sys.modules['unittest.main']
original = module.installHandler
def restore():
module.installHandler = original
Expand Down