Merge heads

2014-02-19 19:03:58 +02:00 · 2014-02-19 19:03:58 +02:00 · 2bb6c358e8
parent 162c477f41 1f9e601765
commit 2bb6c358e8
1 changed files with 4 additions and 0 deletions
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@ -91,6 +91,10 @@ class SysModuleTest(unittest.TestCase):
        self.assertRaises(TypeError, sys.exit, 42, 42)

        # call without argument
+        with self.assertRaises(SystemExit) as cm:
+            sys.exit()
+        self.assertIsNone(cm.exception.code)
+
        rc, out, err = assert_python_ok('-c', 'import sys; sys.exit()')
        self.assertEqual(rc, 0)
        self.assertEqual(out, b'')