Remove import and rename file to use pytest's conftest.py

Close #3493 see https://docs.pytest.org/en/2.7.3/plugins.html?highlight=re

4 files changed, 5 insertions, 18 deletions

diff --git a/tests/message/generic_fixtures.py b/tests/message/conftest.py
index f857caff4..c4e50571e 100644
--- a/tests/message/generic_fixtures.py
+++ b/tests/message/conftest.py
@@ -1,5 +1,7 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/master/COPYING
+# pylint: disable=redefined-outer-name
+
 
 import pytest
 
@@ -24,7 +26,7 @@ def empty_store():
 
 @pytest.fixture
 def store():
-    store = MessageDefinitionStore()
+    store_ = MessageDefinitionStore()
 
     class Checker(BaseChecker):
         name = "achecker"
@@ -43,8 +45,8 @@ def store():
             ),
         }
 
-    store.register_messages_from_checker(Checker())
-    return store
+    store_.register_messages_from_checker(Checker())
+    return store_
 
 
 @pytest.fixture
diff --git a/tests/message/unittest_message.py b/tests/message/unittest_message.py
index 5e30f9e5f..c74027013 100644
--- a/tests/message/unittest_message.py
+++ b/tests/message/unittest_message.py
@@ -3,11 +3,6 @@
 
 from pylint.message import Message
 
-from .generic_fixtures import (  # pylint: disable=unused-import
-    message_definitions,
-    store,
-)
-
 
 def test_new_message(message_definitions):
     def build_message(message_definition, location_value):
diff --git a/tests/message/unittest_message_definition_store.py b/tests/message/unittest_message_definition_store.py
index d7422ec9c..74db42327 100644
--- a/tests/message/unittest_message_definition_store.py
+++ b/tests/message/unittest_message_definition_store.py
@@ -10,8 +10,6 @@ from pylint.checkers import BaseChecker
 from pylint.exceptions import InvalidMessageError, UnknownMessageError
 from pylint.message import MessageDefinition
 
-from .generic_fixtures import empty_store, store  # pylint: disable=unused-import
-
 
 @pytest.mark.parametrize(
     "messages,expected",
diff --git a/tests/message/unittest_message_id_store.py b/tests/message/unittest_message_id_store.py
index 54518998a..ba89a4610 100644
--- a/tests/message/unittest_message_id_store.py
+++ b/tests/message/unittest_message_id_store.py
@@ -5,14 +5,6 @@ import pytest
 
 from pylint.exceptions import InvalidMessageError, UnknownMessageError
 
-from .generic_fixtures import (  # pylint: disable=unused-import
-    empty_msgid_store,
-    message_definitions,
-    msgid_store,
-    msgids,
-    store,
-)
-
 
 def test_len_str(msgid_store, msgids):
     assert len(msgid_store) == len(msgids)