From c98e402dad2ddbcbfb42f0a87b462ed8b2becf78 2013-08-10 19:06:12 From: Jonathan Frederic Date: 2013-08-10 19:06:12 Subject: [PATCH] "not (x or y)" reads as "neither x nor y"... --- diff --git a/IPython/nbconvert/tests/base.py b/IPython/nbconvert/tests/base.py index 26f6ec6..81df37b 100644 --- a/IPython/nbconvert/tests/base.py +++ b/IPython/nbconvert/tests/base.py @@ -150,6 +150,6 @@ class TestsBase(ParametricTestCase): """ stdout, stderr, retcode = get_output_error_code(ipy_cmd + parameters) - if retcode != 0 and not ignore_return_code: + if not (retcode == 0 or ignore_return_code): raise OSError(stderr) return stdout, stderr