Merge the two tests for use-symbolic-message-instead

Keep the more explicit name.

5 files changed, 31 insertions, 36 deletions

diff --git a/tests/functional/m/messages_managed_by_id.py b/tests/functional/m/messages_managed_by_id.py
deleted file mode 100644
index ddcf0bedc..000000000
--- a/tests/functional/m/messages_managed_by_id.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""Use symbolic message instead are also tested in use_symbolic_message_instead.py"""
-# pylint: disable=C0111  # [use-symbolic-message-instead]
-
-
-def foo():  # pylint: disable=C0102  # [use-symbolic-message-instead]
-    return 1
-
-
-def toto():  # pylint: disable=C0102,R1711  # [use-symbolic-message-instead,use-symbolic-message-instead]
-    return
-
-
-def test_enabled_by_id_msg():  # pylint: enable=C0111  # [use-symbolic-message-instead,missing-function-docstring]
-    pass
-
-
-def baz(): #pylint: disable=blacklisted-name
-    return 1
diff --git a/tests/functional/m/messages_managed_by_id.txt b/tests/functional/m/messages_managed_by_id.txt
deleted file mode 100644
index 83ef807ca..000000000
--- a/tests/functional/m/messages_managed_by_id.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-use-symbolic-message-instead:2:0::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead"
-use-symbolic-message-instead:5:0::"'C0102' is cryptic: use '# pylint: disable=blacklisted-name' instead"
-use-symbolic-message-instead:9:0::"'C0102' is cryptic: use '# pylint: disable=blacklisted-name' instead"
-use-symbolic-message-instead:9:0::"'R1711' is cryptic: use '# pylint: disable=useless-return' instead"
-missing-function-docstring:13:0:test_enabled_by_id_msg:Missing function or method docstring
-use-symbolic-message-instead:13:0::"'C0111' is cryptic: use '# pylint: enable=missing-docstring' instead"
diff --git a/tests/functional/p/pragma_after_backslash.py b/tests/functional/p/pragma_after_backslash.py
index b7ccd74d3..4de44bd7d 100644
--- a/tests/functional/p/pragma_after_backslash.py
+++ b/tests/functional/p/pragma_after_backslash.py
@@ -1,5 +1,5 @@
 """Test that a pragma has an effect when separated by a backslash."""
-# pylint: disable=too-few-public-methods,use-symbolic-message-instead
+# pylint: disable=too-few-public-methods
 
 class Foo:
     """block-disable test"""
diff --git a/tests/functional/u/use/use_symbolic_message_instead.py b/tests/functional/u/use/use_symbolic_message_instead.py
index c5fea1261..afdd93c67 100644
--- a/tests/functional/u/use/use_symbolic_message_instead.py
+++ b/tests/functional/u/use/use_symbolic_message_instead.py
@@ -1,11 +1,25 @@
-"""Use symbolic message instead are also tested in messages_managed_by_id.py"""
-
 # pylint: disable=C0111,R0903,T1234  # [bad-option-value,use-symbolic-message-instead,use-symbolic-message-instead]
 # pylint: enable=C0111   # [use-symbolic-message-instead]
 
-def myfunction(arg):  # [missing-function-docstring]
+def my_function(arg):  # [missing-function-docstring]
     return arg or True
 
 # pylint: disable=C0111  # [use-symbolic-message-instead]
 # pylint: enable=R0903  # [use-symbolic-message-instead]
 # pylint: disable=R0903  # [use-symbolic-message-instead]
+
+
+def foo():  # pylint: disable=C0102  # [use-symbolic-message-instead]
+    return 1
+
+
+def toto():  # pylint: disable=C0102,R1711  # [use-symbolic-message-instead,use-symbolic-message-instead]
+    return
+
+
+def test_enabled_by_id_msg():  # pylint: enable=C0111  # [use-symbolic-message-instead,missing-function-docstring]
+    pass
+
+
+def baz():  # pylint: disable=blacklisted-name
+    return 1
diff --git a/tests/functional/u/use/use_symbolic_message_instead.txt b/tests/functional/u/use/use_symbolic_message_instead.txt
index 855c9d509..09861bf06 100644
--- a/tests/functional/u/use/use_symbolic_message_instead.txt
+++ b/tests/functional/u/use/use_symbolic_message_instead.txt
@@ -1,8 +1,13 @@
-bad-option-value:3:0::Bad option value 'T1234'
-use-symbolic-message-instead:3:0::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead"
-use-symbolic-message-instead:3:0::"'R0903' is cryptic: use '# pylint: disable=too-few-public-methods' instead"
-use-symbolic-message-instead:4:0::"'C0111' is cryptic: use '# pylint: enable=missing-docstring' instead"
-missing-function-docstring:6:0:myfunction:Missing function or method docstring
-use-symbolic-message-instead:9:0::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead"
-use-symbolic-message-instead:10:0::"'R0903' is cryptic: use '# pylint: enable=too-few-public-methods' instead"
-use-symbolic-message-instead:11:0::"'R0903' is cryptic: use '# pylint: disable=too-few-public-methods' instead"
+bad-option-value:1:0::Bad option value 'T1234'
+use-symbolic-message-instead:1:0::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead"
+use-symbolic-message-instead:1:0::"'R0903' is cryptic: use '# pylint: disable=too-few-public-methods' instead"
+use-symbolic-message-instead:2:0::"'C0111' is cryptic: use '# pylint: enable=missing-docstring' instead"
+missing-function-docstring:4:0:my_function:Missing function or method docstring
+use-symbolic-message-instead:7:0::"'C0111' is cryptic: use '# pylint: disable=missing-docstring' instead"
+use-symbolic-message-instead:8:0::"'R0903' is cryptic: use '# pylint: enable=too-few-public-methods' instead"
+use-symbolic-message-instead:9:0::"'R0903' is cryptic: use '# pylint: disable=too-few-public-methods' instead"
+use-symbolic-message-instead:12:0::"'C0102' is cryptic: use '# pylint: disable=blacklisted-name' instead"
+use-symbolic-message-instead:16:0::"'C0102' is cryptic: use '# pylint: disable=blacklisted-name' instead"
+use-symbolic-message-instead:16:0::"'R1711' is cryptic: use '# pylint: disable=useless-return' instead"
+missing-function-docstring:20:0:test_enabled_by_id_msg:Missing function or method docstring
+use-symbolic-message-instead:20:0::"'C0111' is cryptic: use '# pylint: enable=missing-docstring' instead"