From 6367f0f5f19185ae031e465fca904298b124b880 Mon Sep 17 00:00:00 2001
From: Sankt Petersbug <sankt.petersbug@gmail.com>
Date: Tue, 14 Aug 2018 16:07:29 -0500
Subject: [PATCH 1/6] fix `filterwarnings` mark not registered

---
 src/_pytest/warnings.py  |  8 ++++++++
 testing/test_warnings.py | 15 +++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/_pytest/warnings.py b/src/_pytest/warnings.py
index abd04801b..f2f23a6e2 100644
--- a/src/_pytest/warnings.py
+++ b/src/_pytest/warnings.py
@@ -49,6 +49,14 @@ def pytest_addoption(parser):
     )
 
 
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers",
+        "filterwarnings(warning): add a warning filter to the given test. "
+        "see http://pytest.org/latest/warnings.html#pytest-mark-filterwarnings ",
+    )
+
+
 @contextmanager
 def catch_warnings_for_item(item):
     """
diff --git a/testing/test_warnings.py b/testing/test_warnings.py
index 15ec36600..99a5aff47 100644
--- a/testing/test_warnings.py
+++ b/testing/test_warnings.py
@@ -287,3 +287,18 @@ def test_non_string_warning_argument(testdir):
     )
     result = testdir.runpytest("-W", "always")
     result.stdout.fnmatch_lines(["*= 1 passed, 1 warnings in *"])
+
+
+def test_filterwarnings_mark_registration(testdir):
+    """Ensure filterwarnings mark is registered"""
+    testdir.makepyfile(
+        """
+        import pytest
+
+        @pytest.mark.filterwarnings('error')
+        def test_error():
+            assert True
+    """
+    )
+    result = testdir.runpytest("--strict")
+    assert result.ret == 0

From cb77e65c97896b6fca8ce5f3d33541200a3d8b65 Mon Sep 17 00:00:00 2001
From: Sankt Petersbug <sankt.petersbug@gmail.com>
Date: Tue, 14 Aug 2018 16:16:25 -0500
Subject: [PATCH 2/6] updated AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 49440194e..babe7fee0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -217,3 +217,4 @@ Xuecong Liao
 Zoltán Máté
 Roland Puntaier
 Allan Feldman
+Sankt Petersbug

From e06a077ac25771591ed9cd21f26390e7e0d28e57 Mon Sep 17 00:00:00 2001
From: Sankt Petersbug <sankt.petersbug@gmail.com>
Date: Tue, 14 Aug 2018 16:16:37 -0500
Subject: [PATCH 3/6] added changelog

---
 changelog/3671.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/3671.bugfix.rst

diff --git a/changelog/3671.bugfix.rst b/changelog/3671.bugfix.rst
new file mode 100644
index 000000000..c9562b390
--- /dev/null
+++ b/changelog/3671.bugfix.rst
@@ -0,0 +1 @@
+Fix ``filterwarnings`` mark not registered
\ No newline at end of file

From c1c08852f99e647335fb8e5b1040450f7cc09e00 Mon Sep 17 00:00:00 2001
From: Sankt Petersbug <sankt.petersbug@gmail.com>
Date: Tue, 14 Aug 2018 19:54:51 -0500
Subject: [PATCH 4/6] lint checks

---
 changelog/3671.bugfix.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/3671.bugfix.rst b/changelog/3671.bugfix.rst
index c9562b390..9c61f8463 100644
--- a/changelog/3671.bugfix.rst
+++ b/changelog/3671.bugfix.rst
@@ -1 +1 @@
-Fix ``filterwarnings`` mark not registered
\ No newline at end of file
+Fix ``filterwarnings`` mark not registered

From 212ee450b7836a4f2ab5e8626c521d5febcf94fe Mon Sep 17 00:00:00 2001
From: Sankt Petersbug <sankt.petersbug@gmail.com>
Date: Tue, 14 Aug 2018 20:29:42 -0500
Subject: [PATCH 5/6] simplified test function

---
 testing/test_warnings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/test_warnings.py b/testing/test_warnings.py
index 99a5aff47..a26fb4597 100644
--- a/testing/test_warnings.py
+++ b/testing/test_warnings.py
@@ -296,8 +296,8 @@ def test_filterwarnings_mark_registration(testdir):
         import pytest
 
         @pytest.mark.filterwarnings('error')
-        def test_error():
-            assert True
+        def test_func():
+            pass
     """
     )
     result = testdir.runpytest("--strict")

From 78ef531420f2327a0daaa1c28a19ceefb9ce7b7f Mon Sep 17 00:00:00 2001
From: Sankt Petersbug <sankt.petersbug@gmail.com>
Date: Tue, 14 Aug 2018 20:33:55 -0500
Subject: [PATCH 6/6] corrected the position of myname

---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index babe7fee0..4a322b0a5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -182,6 +182,7 @@ Russel Winder
 Ryan Wooden
 Samuel Dion-Girardeau
 Samuele Pedroni
+Sankt Petersbug
 Segev Finer
 Serhii Mozghovyi
 Simon Gomizelj
@@ -217,4 +218,3 @@ Xuecong Liao
 Zoltán Máté
 Roland Puntaier
 Allan Feldman
-Sankt Petersbug