summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_thread.py
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2015-04-13 20:11:34 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2015-04-13 20:11:34 (GMT)
commit65da9a87c543eec3126ced378464da0fc8cd7542 (patch)
treecbd250edf6901d8969f3554eb2bc619e9e1924a4 /Lib/test/test_thread.py
parentae18f387e4d0dd0083dc579feef395a5cbf890ce (diff)
parent38c707e7e0322f9139bb51ad73ede1e3b46985ef (diff)
downloadcpython-65da9a87c543eec3126ced378464da0fc8cd7542.zip
cpython-65da9a87c543eec3126ced378464da0fc8cd7542.tar.gz
cpython-65da9a87c543eec3126ced378464da0fc8cd7542.tar.bz2
merge heads
Diffstat (limited to 'Lib/test/test_thread.py')
-rw-r--r--Lib/test/test_thread.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 6144901..ef3059b 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -252,9 +252,5 @@ class TestForkInThread(unittest.TestCase):
pass
-def test_main():
- support.run_unittest(ThreadRunningTests, BarrierTest, LockTests,
- TestForkInThread)
-
if __name__ == "__main__":
- test_main()
+ unittest.main()