[Python-checkins] cpython (merge default -> default): Merge heads

[serhiy.storchaka]

http://hg.python.org/cpython/rev/eec4e6ef1765
changeset:   89280:eec4e6ef1765
parent:      89278:13d27bad7393
parent:      89276:24412574fe24
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Wed Feb 19 19:04:12 2014 +0200
summary:
  Merge heads

files:
  Lib/test/test_sys.py |  4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -94,6 +94,10 @@
         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'')

-- 
Repository URL: http://hg.python.org/cpython