Merge pull request #7553 from minrk/kernel-test-intermittent

address intermittent failure in execute_stop_on_error

IPython/kernel/tests/test_message_spec.py

@@ -307,7 +307,13 b' def test_execute_stop_on_error():'
     """execute request should not abort execution queue with stop_on_error False"""
     flush_channels()
 
-    KC.execute(code='raise IOError')
+    fail = '\n'.join([
+        # sleep to ensure subsequent message is waiting in the queue to be aborted
+        'import time',
+        'time.sleep(0.5)',
+        'raise ValueError',
+    ])
+    KC.execute(code=fail)
     msg_id = KC.execute(code='print("Hello")')
     KC.get_shell_msg(timeout=TIMEOUT)
     reply = KC.get_shell_msg(timeout=TIMEOUT)
@@ -315,7 +321,7 b' def test_execute_stop_on_error():'
 
     flush_channels()
 
-    KC.execute(code='raise IOError', stop_on_error=False)
+    KC.execute(code=fail, stop_on_error=False)
     msg_id = KC.execute(code='print("Hello")')
     KC.get_shell_msg(timeout=TIMEOUT)
     reply = KC.get_shell_msg(timeout=TIMEOUT)