From 08d83a5c6a7c74cd00d21887731ad26a4412d7fd Mon Sep 17 00:00:00 2001 From: Jonas Obrist Date: Mon, 10 Apr 2017 17:50:18 +0900 Subject: [PATCH] updated changelog and authors files --- AUTHORS | 1 + CHANGELOG.rst | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/AUTHORS b/AUTHORS index 3d59906b2..3d7f10d5e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -78,6 +78,7 @@ Javier Romero Jeff Widman John Towler Jon Sonesen +Jonas Obrist Jordan Guymon Joshua Bronson Jurko Gospodnetić diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6eae9b1d1..ea758a317 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -69,6 +69,9 @@ Changes * ``PluginManager.import_plugin`` now accepts unicode plugin names in Python 2. Thanks `@reutsharabani`_ for the PR. +* fix `#2308`_: When using both ``--lf`` and ``--ff``, only the last failed tests are run. + Thanks `@ojii`_ for the PR. + Bug Fixes --------- @@ -88,6 +91,7 @@ Bug Fixes .. _@reutsharabani: https://github.com/reutsharabani .. _@unsignedint: https://github.com/unsignedint .. _@Kriechi: https://github.com/Kriechi +.. _@ojii: https://github.com/ojii .. _#1407: https://github.com/pytest-dev/pytest/issues/1407 @@ -101,6 +105,7 @@ Bug Fixes .. _#2147: https://github.com/pytest-dev/pytest/issues/2147 .. _#2208: https://github.com/pytest-dev/pytest/issues/2208 .. _#2228: https://github.com/pytest-dev/pytest/issues/2228 +.. _#2308: https://github.com/pytest-dev/pytest/issues/2308 3.0.8 (unreleased)