Merge heads

serhiy-storchaka · serhiy-storchaka · commit d8ea31417a0a · 2014-02-19T19:04:12.000+02:00
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -94,6 +94,10 @@ def test_exit(self):
         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'')
