Skip to content

Commit 88fbf07

Browse files
msimacekmsimacek
committed
[GR-24326] Add test_main among tests
PullRequest: graalpython/1057
2 parents 948e308 + 04405ab commit 88fbf07

File tree

3 files changed

+172
-2
lines changed

3 files changed

+172
-2
lines changed

‎graalpython/com.oracle.graal.python.test/src/tests/run_cpython_test.py

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3+
#
4+
# The Universal Permissive License (UPL), Version 1.0
5+
#
6+
# Subject to the condition set forth below, permission is hereby granted to any
7+
# person obtaining a copy of this software, associated documentation and/or
8+
# data (collectively the "Software"), free of charge and under any and all
9+
# copyright rights in the Software, and any and all patent rights owned or
10+
# freely licensable by each licensor hereunder covering either (i) the
11+
# unmodified Software as contributed to or provided by such licensor, or (ii)
12+
# the Larger Works (as defined below), to deal in both
13+
#
14+
# (a) the Software, and
15+
#
16+
# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
17+
# one is included with the Software each a "Larger Work" to which the Software
18+
# is contributed by such licensors),
19+
#
20+
# without restriction, including without limitation the rights to copy, create
21+
# derivative works of, display, perform, and distribute the Software and make,
22+
# use, sell, offer for sale, import, export, have made, and have sold the
23+
# Software and the Larger Work(s), and to sublicense the foregoing rights on
24+
# either these or other terms.
25+
#
26+
# This license is subject to the following condition:
27+
#
28+
# The above copyright notice and either this complete permission notice or at a
29+
# minimum a reference to the UPL must be included in all copies or substantial
30+
# portions of the Software.
31+
#
32+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
33+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
34+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
35+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
36+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
37+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
38+
# SOFTWARE.
39+
40+
import os
41+
import sys
42+
import unittest
43+
44+
sys.path.insert(0, os.getcwd())
45+
46+
47+
class TestLoader(unittest.TestLoader):
48+
def loadTestsFromModule(self, module, pattern=None):
49+
suite = super().loadTestsFromModule(module, pattern=pattern)
50+
test_main = getattr(module, 'test_main', None)
51+
if callable(test_main):
52+
class TestMain(unittest.TestCase):
53+
pass
54+
55+
TestMain.__module__ = test_main.__module__
56+
TestMain.__qualname__ = TestMain.__name__
57+
TestMain.test_main = staticmethod(test_main)
58+
suite.addTests(self.loadTestsFromTestCase(TestMain))
59+
return suite
60+
61+
62+
# We would normmally just pass the loader to the main, but there are tests for the framework itself (test_unittest)
63+
# that interact weirdly with non-default loaders
64+
unittest.defaultTestLoader = TestLoader()
65+
unittest.main(module=None, testLoader=unittest.defaultTestLoader)

‎graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050
TAGS_DIR = "null"
5151

5252

53+
RUNNER = os.path.join(os.path.dirname(__file__), "run_cpython_test.py")
54+
55+
5356
def working_selectors(tagfile):
5457
if os.path.exists(tagfile):
5558
with open(tagfile) as f:
@@ -84,7 +87,7 @@ def fun(self):
8487
cmd.append("--inspect")
8588
if "-debug-java" in sys.argv:
8689
cmd.append("-debug-java")
87-
cmd += ["-S", "-m", "unittest"]
90+
cmd += ["-S", RUNNER]
8891
for testpattern in working_test[1]:
8992
cmd.extend(["-k", testpattern])
9093
testmod = working_test[0].rpartition(".")[2]
@@ -169,7 +172,7 @@ def parse_unittest_output(output):
169172
# (there will be one even if everything succeeds) filter out possible false-passes caused by
170173
# the tests catching all exceptions somewhere
171174
cmd += ['--experimental-options', '--python.CatchAllExceptions']
172-
cmd += ["-S", "-m", "unittest", "-v"]
175+
cmd += ["-S", RUNNER, "-v"]
173176
tagfile = os.path.join(TAGS_DIR, testfile_stem + ".txt")
174177
if retag and repeat == 0:
175178
test_selectors = []

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_unittest.txt

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,82 @@
103103
*unittest.test.test_loader.Test_TestLoader.test_testMethodPrefix__loadTestsFromName
104104
*unittest.test.test_loader.Test_TestLoader.test_testMethodPrefix__loadTestsFromNames
105105
*unittest.test.test_loader.Test_TestLoader.test_testMethodPrefix__loadTestsFromTestCase
106+
*unittest.test.test_program.TestCommandLineArgs.testBufferCatchFailfast
107+
*unittest.test.test_program.TestCommandLineArgs.testCatchBreakInstallsHandler
108+
*unittest.test.test_program.TestCommandLineArgs.testParseArgsAbsolutePathsThatCanBeConverted
109+
*unittest.test.test_program.TestCommandLineArgs.testParseArgsAbsolutePathsThatCannotBeConverted
110+
*unittest.test.test_program.TestCommandLineArgs.testParseArgsFileNames
111+
*unittest.test.test_program.TestCommandLineArgs.testParseArgsFilePaths
112+
*unittest.test.test_program.TestCommandLineArgs.testParseArgsNonExistentFiles
113+
*unittest.test.test_program.TestCommandLineArgs.testParseArgsSelectedTestNames
114+
*unittest.test.test_program.TestCommandLineArgs.testRunTestsOldRunnerClass
115+
*unittest.test.test_program.TestCommandLineArgs.testRunTestsRunnerClass
116+
*unittest.test.test_program.TestCommandLineArgs.testRunTestsRunnerInstance
117+
*unittest.test.test_program.TestCommandLineArgs.testSelectedTestNamesFunctionalTest
118+
*unittest.test.test_program.TestCommandLineArgs.testVerbosity
119+
*unittest.test.test_program.TestCommandLineArgs.testWarning
120+
*unittest.test.test_program.TestCommandLineArgs.test_locals
121+
*unittest.test.test_program.Test_TestProgram.testNoExit
122+
*unittest.test.test_program.Test_TestProgram.test_Exit
123+
*unittest.test.test_program.Test_TestProgram.test_ExitAsDefault
124+
*unittest.test.test_program.Test_TestProgram.test_NonExit
125+
*unittest.test.test_program.Test_TestProgram.test_defaultTest_with_iterable
126+
*unittest.test.test_program.Test_TestProgram.test_defaultTest_with_string
127+
*unittest.test.test_program.Test_TestProgram.test_discovery_from_dotted_path
128+
*unittest.test.test_result.TestOutputBuffering.testBufferOutputAddErrorOrFailure
129+
*unittest.test.test_result.TestOutputBuffering.testBufferOutputOff
130+
*unittest.test.test_result.TestOutputBuffering.testBufferOutputStartTestAddSuccess
131+
*unittest.test.test_result.TestOutputBuffering.testBufferSetUpModule
132+
*unittest.test.test_result.TestOutputBuffering.testBufferSetupClass
133+
*unittest.test.test_result.TestOutputBuffering.testBufferTearDownClass
134+
*unittest.test.test_result.TestOutputBuffering.testBufferTearDownModule
135+
*unittest.test.test_result.Test_OldTestResult.testOldResultWithRunner
136+
*unittest.test.test_result.Test_OldTestResult.testOldTestResult
137+
*unittest.test.test_result.Test_OldTestResult.testOldTestResultClass
138+
*unittest.test.test_result.Test_OldTestResult.testOldTestTesultSetup
139+
*unittest.test.test_result.Test_TestResult.testFailFast
140+
*unittest.test.test_result.Test_TestResult.testFailFastSetByRunner
141+
*unittest.test.test_result.Test_TestResult.testGetDescriptionWithMultiLineDocstring
142+
*unittest.test.test_result.Test_TestResult.testGetDescriptionWithOneLineDocstring
143+
*unittest.test.test_result.Test_TestResult.testGetDescriptionWithoutDocstring
144+
*unittest.test.test_result.Test_TestResult.testGetDuplicatedNestedSubTestDescriptionWithoutDocstring
145+
*unittest.test.test_result.Test_TestResult.testGetNestedSubTestDescriptionWithoutDocstring
146+
*unittest.test.test_result.Test_TestResult.testGetSubTestDescriptionForFalsyValues
147+
*unittest.test.test_result.Test_TestResult.testGetSubTestDescriptionWithMultiLineDocstring
148+
*unittest.test.test_result.Test_TestResult.testGetSubTestDescriptionWithOneLineDocstring
149+
*unittest.test.test_result.Test_TestResult.testGetSubTestDescriptionWithoutDocstring
150+
*unittest.test.test_result.Test_TestResult.testGetSubTestDescriptionWithoutDocstringAndParams
151+
*unittest.test.test_result.Test_TestResult.testStackFrameTrimming
152+
*unittest.test.test_result.Test_TestResult.test_addError
153+
*unittest.test.test_result.Test_TestResult.test_addError_locals
154+
*unittest.test.test_result.Test_TestResult.test_addFailure
155+
*unittest.test.test_result.Test_TestResult.test_addSubTest
156+
*unittest.test.test_result.Test_TestResult.test_addSuccess
157+
*unittest.test.test_result.Test_TestResult.test_init
158+
*unittest.test.test_result.Test_TestResult.test_startTest
159+
*unittest.test.test_result.Test_TestResult.test_startTestRun_stopTestRun
160+
*unittest.test.test_result.Test_TestResult.test_stop
161+
*unittest.test.test_result.Test_TestResult.test_stopTest
162+
*unittest.test.test_runner.TestClassCleanup.test_addClassCleanUp
163+
*unittest.test.test_runner.TestClassCleanup.test_doClassCleanups_with_errors_addClassCleanUp
164+
*unittest.test.test_runner.TestCleanUp.testCleanUp
165+
*unittest.test.test_runner.TestCleanUp.testCleanUpWithErrors
166+
*unittest.test.test_runner.TestCleanUp.testCleanupInRun
167+
*unittest.test.test_runner.TestCleanUp.testTestCaseDebugExecutesCleanups
168+
*unittest.test.test_runner.TestModuleCleanUp.test_addModuleCleanup_arg_errors
169+
*unittest.test.test_runner.TestModuleCleanUp.test_add_and_do_ModuleCleanup
170+
*unittest.test.test_runner.TestModuleCleanUp.test_doModuleCleanup_with_errors_in_addModuleCleanup
171+
*unittest.test.test_runner.Test_TextTestRunner.testBufferAndFailfast
172+
*unittest.test.test_runner.Test_TextTestRunner.testRunnerRegistersResult
173+
*unittest.test.test_runner.Test_TextTestRunner.testSpecifiedStreamUsed
174+
*unittest.test.test_runner.Test_TextTestRunner.testStdErrLookedUpAtInstantiationTime
175+
*unittest.test.test_runner.Test_TextTestRunner.test_init
176+
*unittest.test.test_runner.Test_TextTestRunner.test_locals
177+
*unittest.test.test_runner.Test_TextTestRunner.test_multiple_inheritance
178+
*unittest.test.test_runner.Test_TextTestRunner.test_pickle_unpickle
179+
*unittest.test.test_runner.Test_TextTestRunner.test_resultclass
180+
*unittest.test.test_runner.Test_TextTestRunner.test_startTestRun_stopTestRun_called
181+
*unittest.test.test_runner.Test_TextTestRunner.test_works_with_result_without_startTestRun_stopTestRun
106182
*unittest.test.test_setups.TestSetups.test_class_not_setup_or_torndown_when_skipped
107183
*unittest.test.test_setups.TestSetups.test_class_not_torndown_when_setup_fails
108184
*unittest.test.test_setups.TestSetups.test_setup_teardown_order_with_pathological_suite
@@ -120,3 +196,29 @@
120196
*unittest.test.test_skipping.Test_TestSkipping.test_skipping_subtests
121197
*unittest.test.test_skipping.Test_TestSkipping.test_unexpected_success
122198
*unittest.test.test_skipping.Test_TestSkipping.test_unexpected_success_subtests
199+
*unittest.test.test_suite.Test_TestSuite.test_addTest__TestCase
200+
*unittest.test.test_suite.Test_TestSuite.test_addTest__TestSuite
201+
*unittest.test.test_suite.Test_TestSuite.test_addTest__casesuiteclass
202+
*unittest.test.test_suite.Test_TestSuite.test_addTest__noncallable
203+
*unittest.test.test_suite.Test_TestSuite.test_addTest__noniterable
204+
*unittest.test.test_suite.Test_TestSuite.test_addTests
205+
*unittest.test.test_suite.Test_TestSuite.test_addTests__string
206+
*unittest.test.test_suite.Test_TestSuite.test_basetestsuite
207+
*unittest.test.test_suite.Test_TestSuite.test_countTestCases_nested
208+
*unittest.test.test_suite.Test_TestSuite.test_countTestCases_simple
209+
*unittest.test.test_suite.Test_TestSuite.test_countTestCases_zero_nested
210+
*unittest.test.test_suite.Test_TestSuite.test_countTestCases_zero_simple
211+
*unittest.test.test_suite.Test_TestSuite.test_eq
212+
*unittest.test.test_suite.Test_TestSuite.test_function_in_suite
213+
*unittest.test.test_suite.Test_TestSuite.test_init__TestSuite_instances_in_tests
214+
*unittest.test.test_suite.Test_TestSuite.test_init__empty_tests
215+
*unittest.test.test_suite.Test_TestSuite.test_init__tests_from_any_iterable
216+
*unittest.test.test_suite.Test_TestSuite.test_init__tests_optional
217+
*unittest.test.test_suite.Test_TestSuite.test_iter
218+
*unittest.test.test_suite.Test_TestSuite.test_ne
219+
*unittest.test.test_suite.Test_TestSuite.test_overriding_call
220+
*unittest.test.test_suite.Test_TestSuite.test_remove_test_at_index
221+
*unittest.test.test_suite.Test_TestSuite.test_remove_test_at_index_not_indexable
222+
*unittest.test.test_suite.Test_TestSuite.test_run
223+
*unittest.test.test_suite.Test_TestSuite.test_run__empty_suite
224+
*unittest.test.test_suite.Test_TestSuite.test_run__requires_result

0 commit comments

Comments
 (0)