Clean up some warnings in test suite output.

This commit is contained in:
Nadeem Vawda 2012-10-14 01:42:32 +02:00
parent ba3e4a0bc0
commit 6d70870812
2 changed files with 6 additions and 5 deletions

View File

@ -8,7 +8,7 @@ import weakref
import errno import errno
from test.support import (TESTFN, unlink, run_unittest, captured_output, from test.support import (TESTFN, unlink, run_unittest, captured_output,
gc_collect, cpython_only, no_tracing) check_warnings, gc_collect, cpython_only, no_tracing)
class NaiveException(Exception): class NaiveException(Exception):
def __init__(self, x): def __init__(self, x):
@ -939,9 +939,10 @@ class ImportErrorTests(unittest.TestCase):
def test_non_str_argument(self): def test_non_str_argument(self):
# Issue #15778 # Issue #15778
arg = b'abc' with check_warnings(('', BytesWarning), quiet=True):
exc = ImportError(arg) arg = b'abc'
self.assertEqual(str(arg), str(exc)) exc = ImportError(arg)
self.assertEqual(str(arg), str(exc))
def test_main(): def test_main():

View File

@ -80,7 +80,7 @@ class HandlingFromlist(unittest.TestCase):
with util.import_state(meta_path=[importer]): with util.import_state(meta_path=[importer]):
with self.assertRaises(ImportError) as exc: with self.assertRaises(ImportError) as exc:
import_util.import_('pkg', fromlist=['mod']) import_util.import_('pkg', fromlist=['mod'])
self.assertEquals('i_do_not_exist', exc.exception.name) self.assertEqual('i_do_not_exist', exc.exception.name)
def test_empty_string(self): def test_empty_string(self):
with util.mock_modules('pkg.__init__', 'pkg.mod') as importer: with util.mock_modules('pkg.__init__', 'pkg.mod') as importer: