Cleanup unwanted 'use-symbolic-message-instead' in functional tests

12 files changed, 10 insertions, 14 deletions

diff --git a/tests/functional/c/classes_meth_could_be_a_function.py b/tests/functional/c/classes_meth_could_be_a_function.py
index b9b7cdeb4..2a0976d1a 100644
--- a/tests/functional/c/classes_meth_could_be_a_function.py
+++ b/tests/functional/c/classes_meth_could_be_a_function.py
@@ -1,4 +1,4 @@
-# pylint: disable=C0111,too-few-public-methods,W0232, useless-object-inheritance  # [use-symbolic-message-instead]
+# pylint: disable=C0111,too-few-public-methods,no-init, useless-object-inheritance
 """
 #2479
 
diff --git a/tests/functional/d/decorator_scope.py b/tests/functional/d/decorator_scope.py
index 222e3cc46..141c26d06 100644
--- a/tests/functional/d/decorator_scope.py
+++ b/tests/functional/d/decorator_scope.py
@@ -1,4 +1,4 @@
-# -*- pylint: disable=W0232,too-few-public-methods, useless-object-inheritance  # [use-symbolic-message-instead]
+# -*- pylint: disable=no-init,too-few-public-methods, useless-object-inheritance
 """Test that decorators sees the class namespace - just like
 function default values does but function body doesn't.
 
diff --git a/tests/functional/e/external_classmethod_crash.py b/tests/functional/e/external_classmethod_crash.py
index fd225a17b..7f6b927af 100644
--- a/tests/functional/e/external_classmethod_crash.py
+++ b/tests/functional/e/external_classmethod_crash.py
@@ -1,4 +1,4 @@
-# pylint: disable=W0232,too-few-public-methods,W0613, useless-object-inheritance  # [use-symbolic-message-instead,use-symbolic-message-instead]
+# pylint: disable=no-init,too-few-public-methods,unused-argument,useless-object-inheritance
 """tagging a function as a class method cause a crash when checking for
 signature overriding
 """
diff --git a/tests/functional/f/first_arg.py b/tests/functional/f/first_arg.py
index 2a818ccfc..0b5c0804b 100644
--- a/tests/functional/f/first_arg.py
+++ b/tests/functional/f/first_arg.py
@@ -1,4 +1,4 @@
-# pylint: disable=missing-docstring, W0232, useless-object-inheritance  # [use-symbolic-message-instead]
+# pylint: disable=missing-docstring, no-init, useless-object-inheritance
 """check for methods first arguments
 """
 
diff --git a/tests/functional/f/first_arg.txt b/tests/functional/f/first_arg.txt
index f9a0b63d3..8344fa8dd 100644
--- a/tests/functional/f/first_arg.txt
+++ b/tests/functional/f/first_arg.txt
@@ -1,4 +1,3 @@
-use-symbolic-message-instead:1:0::Id 'W0232' is used to disable 'no-init' message emission
 bad-classmethod-argument:10:4:Obj.__new__:Class method __new__ should have 'cls' as first argument
 no-classmethod-decorator:16:4:Obj:Consider using a decorator instead of calling classmethod
 bad-classmethod-argument:18:4:Obj.class2:Class method class2 should have 'cls' as first argument
diff --git a/tests/functional/f/function_redefined.txt b/tests/functional/f/function_redefined.txt
index 4a0ac939d..26f1c28d2 100644
--- a/tests/functional/f/function_redefined.txt
+++ b/tests/functional/f/function_redefined.txt
@@ -1,7 +1,7 @@
 function-redefined:15:4:AAAA.method2:method already defined line 12
 function-redefined:18:0:AAAA:class already defined line 5
 function-redefined:32:0:func2:function already defined line 29
-redefined-outer-name:34:4:func2:Redefining name '__revision__' from outer scope (line 3)
+redefined-outer-name:34:4:func2:Redefining name '__revision__' from outer scope (line 4)
 function-redefined:51:4:exclusive_func2:function already defined line 45
 function-redefined:86:0:ceil:function already defined line 85
 function-redefined:90:0:math:function already defined line 89
diff --git a/tests/functional/g/genexp_in_class_scope.py b/tests/functional/g/genexp_in_class_scope.py
index 175f07c53..056963813 100644
--- a/tests/functional/g/genexp_in_class_scope.py
+++ b/tests/functional/g/genexp_in_class_scope.py
@@ -1,4 +1,4 @@
-# pylint: disable=W0232,too-few-public-methods, missing-docstring  # [use-symbolic-message-instead]
+# pylint: disable=no-init,too-few-public-methods, missing-docstring
 # pylint: disable=useless-object-inheritance
 """Class scope must be handled correctly in genexps"""
 class MyClass(object):
diff --git a/tests/functional/l/logging_format_interpolation.py b/tests/functional/l/logging_format_interpolation.py
index b546ae835..409faaa29 100644
--- a/tests/functional/l/logging_format_interpolation.py
+++ b/tests/functional/l/logging_format_interpolation.py
@@ -1,4 +1,4 @@
-# pylint: disable=E1101, no-absolute-import, import-error,line-too-long  # [use-symbolic-message-instead]
+# pylint: disable=no-member, no-absolute-import, import-error,line-too-long
 # pylint: disable=invalid-name,missing-docstring,wrong-import-order,wrong-import-position
 try:
     import __builtin__ as builtins
diff --git a/tests/functional/l/logging_format_interpolation.txt b/tests/functional/l/logging_format_interpolation.txt
index 2364e1617..6469d204c 100644
--- a/tests/functional/l/logging_format_interpolation.txt
+++ b/tests/functional/l/logging_format_interpolation.txt
@@ -1,4 +1,3 @@
-use-symbolic-message-instead:1:0::Id 'E1101' is used to disable 'no-member' message emission
 logging-format-interpolation:16:22::Use lazy % formatting in logging functions
 logging-format-interpolation:17:43::Use lazy % formatting in logging functions
 logging-format-interpolation:18:22::Use lazy % formatting in logging functions
diff --git a/tests/functional/n/non/non_init_parent_called.py b/tests/functional/n/non/non_init_parent_called.py
index d330ac11e..1ecc8f16a 100644
--- a/tests/functional/n/non/non_init_parent_called.py
+++ b/tests/functional/n/non/non_init_parent_called.py
@@ -1,5 +1,5 @@
-# pylint: disable=W0212,W0406  # [use-symbolic-message-instead,use-symbolic-message-instead]
-# pylint: disable=no-absolute-import,wrong-import-order, useless-object-inheritance,too-few-public-methods,line-too-long
+# pylint: disable=protected-access,import-self,too-few-public-methods,line-too-long
+# pylint: disable=no-absolute-import,wrong-import-order, useless-object-inheritance,
 """test for call to __init__ from a non ancestor class
 """
 from __future__ import print_function
diff --git a/tests/functional/n/non/non_init_parent_called.txt b/tests/functional/n/non/non_init_parent_called.txt
index 76a797c48..22073d63d 100644
--- a/tests/functional/n/non/non_init_parent_called.txt
+++ b/tests/functional/n/non/non_init_parent_called.txt
@@ -1,5 +1,3 @@
-use-symbolic-message-instead:1:0::Id 'W0212' is used to disable 'protected-access' message emission
-use-symbolic-message-instead:1:0::Id 'W0406' is used to disable 'import-self' message emission
 import-error:7:0::Unable to import 'nonexistant'
 non-parent-init-called:15:8:AAAA.__init__:__init__ method from a non direct base class 'BBBBMixin' is called
 no-member:23:50:CCC:Module 'functional.n.non.non_init_parent_called' has no 'BBBB' member:INFERENCE
diff --git a/tests/functional/p/pragma_after_backslash.py b/tests/functional/p/pragma_after_backslash.py
index 05fa0f6ae..b7ccd74d3 100644
--- a/tests/functional/p/pragma_after_backslash.py
+++ b/tests/functional/p/pragma_after_backslash.py
@@ -7,4 +7,4 @@ class Foo:
     def meth3(self):
         """test one line disabling"""
         print(self.bla) \
-           # pylint: disable=E1101
+           # pylint: disable=no-member