mirror of
https://github.com/python/cpython.git
synced 2025-07-30 14:44:10 +00:00
Reverting the Revision: 77368. I committed Flox's big patch for tests by
mistake. ( It may come in for sure tough)
This commit is contained in:
parent
3ddc435af6
commit
ce8e33a095
107 changed files with 436 additions and 794 deletions
|
@ -7,6 +7,10 @@ from test.test_support import fcmp, have_unicode, TESTFN, unlink, \
|
|||
from operator import neg
|
||||
|
||||
import sys, warnings, cStringIO, random, fractions, UserDict
|
||||
warnings.filterwarnings("ignore", "hex../oct.. of negative int",
|
||||
FutureWarning, __name__)
|
||||
warnings.filterwarnings("ignore", "integer argument expected",
|
||||
DeprecationWarning, "unittest")
|
||||
|
||||
# count the number of test runs.
|
||||
# used to skip running test_execfile() multiple times
|
||||
|
@ -415,11 +419,7 @@ class BuiltinTest(unittest.TestCase):
|
|||
f.write('z = z+1\n')
|
||||
f.write('z = z*2\n')
|
||||
f.close()
|
||||
with warnings.catch_warnings():
|
||||
# Silence Py3k warning
|
||||
warnings.filterwarnings("ignore", ".+ not supported in 3.x",
|
||||
DeprecationWarning)
|
||||
execfile(TESTFN)
|
||||
execfile(TESTFN)
|
||||
|
||||
def test_execfile(self):
|
||||
global numruns
|
||||
|
@ -1542,30 +1542,17 @@ class TestSorted(unittest.TestCase):
|
|||
data = 'The quick Brown fox Jumped over The lazy Dog'.split()
|
||||
self.assertRaises(TypeError, sorted, data, None, lambda x,y: 0)
|
||||
|
||||
def _run_unittest(*args):
|
||||
with warnings.catch_warnings():
|
||||
# Silence Py3k warnings
|
||||
warnings.filterwarnings("ignore", ".+ not supported in 3.x",
|
||||
DeprecationWarning)
|
||||
warnings.filterwarnings("ignore", ".+ is renamed to imp.reload",
|
||||
DeprecationWarning)
|
||||
warnings.filterwarnings("ignore", "integer argument expected, got float",
|
||||
DeprecationWarning)
|
||||
warnings.filterwarnings("ignore", "classic int division",
|
||||
DeprecationWarning)
|
||||
run_unittest(*args)
|
||||
|
||||
def test_main(verbose=None):
|
||||
test_classes = (BuiltinTest, TestSorted)
|
||||
|
||||
_run_unittest(*test_classes)
|
||||
run_unittest(*test_classes)
|
||||
|
||||
# verify reference counting
|
||||
if verbose and hasattr(sys, "gettotalrefcount"):
|
||||
import gc
|
||||
counts = [None] * 5
|
||||
for i in xrange(len(counts)):
|
||||
_run_unittest(*test_classes)
|
||||
run_unittest(*test_classes)
|
||||
gc.collect()
|
||||
counts[i] = sys.gettotalrefcount()
|
||||
print counts
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue