Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 79420 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r79420 | victor.stinner | 2010-03-25 13:24:38 +0100 (jeu., 25 mars 2010) | 10 lines

  Fix my test introduced in test_sys by r79394:

  Restore the orginal filesystem encoding before testing
  assertRaises(LookupError, sys.setfilesystemencoding, "xxx"). Unittest formats
  the exception, but the formatting failed because the file system was invalid
  (set to iso-8859-1 by the previous test).

  Anyway, ensure to restore the original filesystem encoding when exiting
  test_setfilesystemencoding() to avoid error propagation to the other tests.
........
This commit is contained in:
Victor Stinner 2010-03-25 12:26:07 +00:00
parent 5338f05be3
commit adc3691c21
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Lib/test/test_sys.py
View File

@ -756,10 +756,15 @@ class SizeofTest(unittest.TestCase):
def test_setfilesystemencoding(self): def test_setfilesystemencoding(self):
old = sys.getfilesystemencoding() old = sys.getfilesystemencoding()
sys.setfilesystemencoding("iso-8859-1") try:
self.assertEqual(sys.getfilesystemencoding(), "iso-8859-1") sys.setfilesystemencoding("iso-8859-1")
self.assertRaises(LookupError, sys.setfilesystemencoding, "xxx") self.assertEqual(sys.getfilesystemencoding(), "iso-8859-1")
sys.setfilesystemencoding(old) finally:
sys.setfilesystemencoding(old)
try:
self.assertRaises(LookupError, sys.setfilesystemencoding, "xxx")
finally:
sys.setfilesystemencoding(old)
def test_main(): def test_main():
test.support.run_unittest(SysModuleTest, SizeofTest) test.support.run_unittest(SysModuleTest, SizeofTest)