Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-11-10 18:33:02 -02:00
parent c33074c8b9 66fbebfc26
commit 983a09a2d4
43 changed files with 493 additions and 481 deletions
@@ -112,7 +112,7 @@ def wrap_session(config, doit):
                    excinfo.typename, excinfo.value.msg))
            config.hook.pytest_keyboard_interrupt(excinfo=excinfo)
            session.exitstatus = EXIT_INTERRUPTED
-        except:
+        except:  # noqa
            excinfo = _pytest._code.ExceptionInfo()
            config.notify_exception(excinfo, config.option)
            session.exitstatus = EXIT_INTERNALERROR