summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-02-19 17:03:58 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-02-19 17:03:58 (GMT)
commit2bb6c358e886fabe1b04505e3d23cb3cf3fa89b5 (patch)
tree9261f6daabb25a42ce451c6540f33ac4ebf95f3c /Lib
parent162c477f41380d68d0e65e8b3921de86c6d0fbf7 (diff)
parent1f9e6017653596775e4fd582a7f4d64ac86eb8bc (diff)
downloadcpython-2bb6c358e886fabe1b04505e3d23cb3cf3fa89b5.zip
cpython-2bb6c358e886fabe1b04505e3d23cb3cf3fa89b5.tar.gz
cpython-2bb6c358e886fabe1b04505e3d23cb3cf3fa89b5.tar.bz2
Merge heads
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_sys.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 491ae9c..f768e9b 100644
--- 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'')