From 30453057e88de4274d6d4e7532eb89da723d4825 Mon Sep 17 00:00:00 2001 From: Maik Figura Date: Sat, 3 Mar 2018 23:50:13 +0100 Subject: [PATCH 1/2] Add logging plugin to plugins list --- _pytest/logging.py | 1 + changelog/3209.doc | 1 + doc/en/plugins.rst | 1 + 3 files changed, 3 insertions(+) create mode 100644 changelog/3209.doc diff --git a/_pytest/logging.py b/_pytest/logging.py index f6affc8a2..6d9274d1a 100644 --- a/_pytest/logging.py +++ b/_pytest/logging.py @@ -1,3 +1,4 @@ +""" Access and control log capturing. """ from __future__ import absolute_import, division, print_function import logging diff --git a/changelog/3209.doc b/changelog/3209.doc new file mode 100644 index 000000000..84e165805 --- /dev/null +++ b/changelog/3209.doc @@ -0,0 +1 @@ +Add logging plugin to plugins list. \ No newline at end of file diff --git a/doc/en/plugins.rst b/doc/en/plugins.rst index 400418aee..2a9fff81b 100644 --- a/doc/en/plugins.rst +++ b/doc/en/plugins.rst @@ -148,6 +148,7 @@ in the `pytest repository `_. _pytest.resultlog _pytest.runner _pytest.main + _pytest.logging _pytest.skipping _pytest.terminal _pytest.tmpdir From 46f5d7a1bb7edc6883e6141d1d272a4db4be8cc0 Mon Sep 17 00:00:00 2001 From: Maik Figura Date: Sun, 4 Mar 2018 00:52:27 +0100 Subject: [PATCH 2/2] Add filetype to changelog fragment --- changelog/{3209.doc => 3209.doc.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/{3209.doc => 3209.doc.rst} (100%) diff --git a/changelog/3209.doc b/changelog/3209.doc.rst similarity index 100% rename from changelog/3209.doc rename to changelog/3209.doc.rst