Add column to the information checked for functional tests

Author: Pierre-Sassoulas

pylint/testutils/output_line.py

@@ -24,8 +24,8 @@ def __eq__(self, other):
 
 class MalformedOutputLineException(Exception):
     def __init__(self, row, exception):
-        example = "msg-symbolic-name:42:MyClass.my_function:The message"
-        other_example = "msg-symbolic-name:7::The message"
+        example = "msg-symbolic-name:42:27:MyClass.my_function:The message"
+        other_example = "msg-symbolic-name:7:42::The message"
         reconstructed_row = ":".join(row)
         msg = "Expected '{example}' or '{other_example}' but we got '{reconstructed_row}'".format(
             example=example,
@@ -39,14 +39,15 @@ def __init__(self, row, exception):
 
 class OutputLine(
     collections.namedtuple(
-        "OutputLine", ["symbol", "lineno", "object", "msg", "confidence"]
+        "OutputLine", ["symbol", "lineno", "column", "object", "msg", "confidence"]
     )
 ):
     @classmethod
     def from_msg(cls, msg):
         return cls(
             msg.symbol,
             msg.line,
+            str(msg.column),
             msg.obj or "",
             msg.msg.replace("\r\n", "\n"),
             msg.confidence.name
@@ -57,8 +58,8 @@ def from_msg(cls, msg):
     @classmethod
     def from_csv(cls, row):
         try:
-            confidence = row[4] if len(row) == 5 else interfaces.HIGH.name
-            return cls(row[0], int(row[1]), row[2], row[3], confidence)
+            confidence = row[5] if len(row) == 6 else interfaces.HIGH.name
+            return cls(row[0], int(row[1]), str(row[2]), row[3], row[4], confidence)
         except Exception as e:
             raise MalformedOutputLineException(row, e) from e
 

tests/functional/a/abstract_class_instantiated_py3.txt

@@ -1,5 +1,5 @@
-abstract-class-instantiated:108:main:Abstract class 'BadMroAbstractMethods' with abstract methods instantiated
-abstract-class-instantiated:109:main:Abstract class 'BadClass' with abstract methods instantiated
-abstract-class-instantiated:110:main:Abstract class 'SecondBadClass' with abstract methods instantiated
-abstract-class-instantiated:111:main:Abstract class 'ThirdBadClass' with abstract methods instantiated
-abstract-class-instantiated:128:main2:Abstract class 'FourthBadClass' with abstract methods instantiated
+abstract-class-instantiated:108:4:main:Abstract class 'BadMroAbstractMethods' with abstract methods instantiated
+abstract-class-instantiated:109:4:main:Abstract class 'BadClass' with abstract methods instantiated
+abstract-class-instantiated:110:4:main:Abstract class 'SecondBadClass' with abstract methods instantiated
+abstract-class-instantiated:111:4:main:Abstract class 'ThirdBadClass' with abstract methods instantiated
+abstract-class-instantiated:128:4:main2:Abstract class 'FourthBadClass' with abstract methods instantiated

tests/functional/a/abstract_class_instantiated_py34.txt

@@ -1 +1 @@
-abstract-class-instantiated:19:main:Abstract class 'BadClass' with abstract methods instantiated
+abstract-class-instantiated:19:4:main:Abstract class 'BadClass' with abstract methods instantiated

tests/functional/a/abstract_method_py3.txt

@@ -1,16 +1,16 @@
-abstract-method:47:Concrete:"Method 'bbbb' is abstract in class 'Abstract' but is not overridden"
-abstract-method:70:Container:"Method '__hash__' is abstract in class 'Structure' but is not overridden"
-abstract-method:70:Container:"Method '__iter__' is abstract in class 'Structure' but is not overridden"
-abstract-method:70:Container:"Method '__len__' is abstract in class 'Structure' but is not overridden"
-abstract-method:76:Sizable:"Method '__contains__' is abstract in class 'Structure' but is not overridden"
-abstract-method:76:Sizable:"Method '__hash__' is abstract in class 'Structure' but is not overridden"
-abstract-method:76:Sizable:"Method '__iter__' is abstract in class 'Structure' but is not overridden"
-abstract-method:82:Hashable:"Method '__contains__' is abstract in class 'Structure' but is not overridden"
-abstract-method:82:Hashable:"Method '__iter__' is abstract in class 'Structure' but is not overridden"
-abstract-method:82:Hashable:"Method '__len__' is abstract in class 'Structure' but is not overridden"
-abstract-method:87:Iterator:"Method '__contains__' is abstract in class 'Structure' but is not overridden"
-abstract-method:87:Iterator:"Method '__hash__' is abstract in class 'Structure' but is not overridden"
-abstract-method:87:Iterator:"Method '__len__' is abstract in class 'Structure' but is not overridden"
-abstract-method:106:BadComplexMro:"Method '__hash__' is abstract in class 'Structure' but is not overridden"
-abstract-method:106:BadComplexMro:"Method '__len__' is abstract in class 'AbstractSizable' but is not overridden"
-abstract-method:106:BadComplexMro:"Method 'length' is abstract in class 'AbstractSizable' but is not overridden"
+abstract-method:47:0:Concrete:Method 'bbbb' is abstract in class 'Abstract' but is not overridden
+abstract-method:70:0:Container:Method '__hash__' is abstract in class 'Structure' but is not overridden
+abstract-method:70:0:Container:Method '__iter__' is abstract in class 'Structure' but is not overridden
+abstract-method:70:0:Container:Method '__len__' is abstract in class 'Structure' but is not overridden
+abstract-method:76:0:Sizable:Method '__contains__' is abstract in class 'Structure' but is not overridden
+abstract-method:76:0:Sizable:Method '__hash__' is abstract in class 'Structure' but is not overridden
+abstract-method:76:0:Sizable:Method '__iter__' is abstract in class 'Structure' but is not overridden
+abstract-method:82:0:Hashable:Method '__contains__' is abstract in class 'Structure' but is not overridden
+abstract-method:82:0:Hashable:Method '__iter__' is abstract in class 'Structure' but is not overridden
+abstract-method:82:0:Hashable:Method '__len__' is abstract in class 'Structure' but is not overridden
+abstract-method:87:0:Iterator:Method '__contains__' is abstract in class 'Structure' but is not overridden
+abstract-method:87:0:Iterator:Method '__hash__' is abstract in class 'Structure' but is not overridden
+abstract-method:87:0:Iterator:Method '__len__' is abstract in class 'Structure' but is not overridden
+abstract-method:106:0:BadComplexMro:Method '__hash__' is abstract in class 'Structure' but is not overridden
+abstract-method:106:0:BadComplexMro:Method '__len__' is abstract in class 'AbstractSizable' but is not overridden
+abstract-method:106:0:BadComplexMro:Method 'length' is abstract in class 'AbstractSizable' but is not overridden

tests/functional/a/access_member_before_definition.txt

@@ -1,2 +1,2 @@
-access-member-before-definition:8:Aaaa.__init__:Access to member '_var2' before its definition line 9
-access-member-before-definition:28:Bbbb.catchme:Access to member '_repo' before its definition line 30
+access-member-before-definition:8:15:Aaaa.__init__:Access to member '_var2' before its definition line 9
+access-member-before-definition:28:19:Bbbb.catchme:Access to member '_repo' before its definition line 30

tests/functional/a/access_to__name__.txt

@@ -1,2 +1,2 @@
-no-member:10:Aaaa.__init__:Instance of 'Aaaa' has no '__name__' member:INFERENCE
-no-member:21:NewClass.__init__:Instance of 'NewClass' has no '__name__' member:INFERENCE
+no-member:10:14:Aaaa.__init__:Instance of 'Aaaa' has no '__name__' member:INFERENCE
+no-member:21:22:NewClass.__init__:Instance of 'NewClass' has no '__name__' member:INFERENCE

tests/functional/a/access_to_protected_members.txt

@@ -1,9 +1,9 @@
-protected-access:19:MyClass.test:Access to a protected member _haha of a client class
-protected-access:41::Access to a protected member _protected of a client class
-protected-access:42::Access to a protected member _protected of a client class
-protected-access:43::Access to a protected member _cls_protected of a client class
-protected-access:44::Access to a protected member _cls_protected of a client class
-protected-access:58:Issue1031.incorrect_access:Access to a protected member _protected of a client class
-protected-access:72:Issue1802.__eq__:Access to a protected member __private of a client class
-protected-access:80:Issue1802.not_in_special:Access to a protected member _foo of a client class
-protected-access:100:Issue1802.__fake_special__:Access to a protected member _foo of a client class
+protected-access:19:14:MyClass.test:Access to a protected member _haha of a client class
+protected-access:41:0::Access to a protected member _protected of a client class
+protected-access:42:6::Access to a protected member _protected of a client class
+protected-access:43:0::Access to a protected member _cls_protected of a client class
+protected-access:44:6::Access to a protected member _cls_protected of a client class
+protected-access:58:19:Issue1031.incorrect_access:Access to a protected member _protected of a client class
+protected-access:72:48:Issue1802.__eq__:Access to a protected member __private of a client class
+protected-access:80:32:Issue1802.not_in_special:Access to a protected member _foo of a client class
+protected-access:100:32:Issue1802.__fake_special__:Access to a protected member _foo of a client class

tests/functional/a/anomalous_unicode_escape_py3.txt

@@ -1,3 +1,3 @@
-anomalous-unicode-escape-in-string:5::"Anomalous Unicode escape in byte string: '\u'. String constant might be missing an r or u prefix."
-anomalous-unicode-escape-in-string:6::"Anomalous Unicode escape in byte string: '\U'. String constant might be missing an r or u prefix."
-anomalous-unicode-escape-in-string:8::"Anomalous Unicode escape in byte string: '\N'. String constant might be missing an r or u prefix."
+anomalous-unicode-escape-in-string:5:0::"Anomalous Unicode escape in byte string: '\u'. String constant might be missing an r or u prefix."
+anomalous-unicode-escape-in-string:6:0::"Anomalous Unicode escape in byte string: '\U'. String constant might be missing an r or u prefix."
+anomalous-unicode-escape-in-string:8:0::"Anomalous Unicode escape in byte string: '\N'. String constant might be missing an r or u prefix."

tests/functional/a/arguments.txt

@@ -1,39 +1,39 @@
-no-value-for-parameter:46::No value for argument 'first_argument' in function call
-too-many-function-args:47::Too many positional arguments for function call
-no-value-for-parameter:49::No value for argument 'third_argument' in function call
-no-value-for-parameter:51::No value for argument 'first_argument' in function call
-no-value-for-parameter:51::No value for argument 'second_argument' in function call
-no-value-for-parameter:51::No value for argument 'third_argument' in function call
-too-many-function-args:53::Too many positional arguments for function call
-no-value-for-parameter:58::No value for argument 'first_argument' in function call
-unexpected-keyword-arg:58::Unexpected keyword argument 'bob' in function call
-unexpected-keyword-arg:59::Unexpected keyword argument 'coin' in function call
-redundant-keyword-arg:61::Argument 'one' passed by position and keyword in function call
-no-value-for-parameter:66::No value for argument 'arg' in lambda call
-no-value-for-parameter:71:method_tests:No value for argument 'arg' in staticmethod call
-no-value-for-parameter:72:method_tests:No value for argument 'arg' in staticmethod call
-no-value-for-parameter:74:method_tests:No value for argument 'arg' in classmethod call
-no-value-for-parameter:75:method_tests:No value for argument 'arg' in classmethod call
-no-value-for-parameter:77:method_tests:No value for argument 'arg' in method call
-no-value-for-parameter:78:method_tests:No value for argument 'arg' in unbound method call
-no-value-for-parameter:80:method_tests:No value for argument 'arg' in method call
-no-value-for-parameter:81:method_tests:No value for argument 'arg' in unbound method call
-no-value-for-parameter:110:TestStaticMethod.func:No value for argument 'first' in staticmethod call
-too-many-function-args:111:TestStaticMethod.func:Too many positional arguments for staticmethod call
-too-many-function-args:119:TypeCheckConstructor.test:Too many positional arguments for constructor call
-no-value-for-parameter:121:TypeCheckConstructor.test:No value for argument 'first' in constructor call
-no-value-for-parameter:121:TypeCheckConstructor.test:No value for argument 'second' in constructor call
-no-value-for-parameter:122:TypeCheckConstructor.test:No value for argument 'second' in constructor call
-unexpected-keyword-arg:122:TypeCheckConstructor.test:Unexpected keyword argument 'lala' in constructor call
-no-value-for-parameter:133:Test.test:No value for argument 'icon' in method call
-too-many-function-args:134:Test.test:Too many positional arguments for method call
-no-value-for-parameter:136::No value for argument 'icon' in method call
-no-value-for-parameter:163:no_context_but_redefined:No value for argument 'three' in function call
-no-value-for-parameter:163:no_context_but_redefined:No value for argument 'two' in function call
-no-value-for-parameter:166:no_context_one_elem:No value for argument 'three' in function call
-no-value-for-parameter:166:no_context_one_elem:No value for argument 'two' in function call
-unexpected-keyword-arg:202:namedtuple_replace_issue_1036:Unexpected keyword argument 'd' in method call
-unexpected-keyword-arg:202:namedtuple_replace_issue_1036:Unexpected keyword argument 'e' in method call
-no-value-for-parameter:215::No value for argument 'third' in function call
-no-value-for-parameter:216::No value for argument 'second' in function call
-unexpected-keyword-arg:217::Unexpected keyword argument 'fourth' in function call
+no-value-for-parameter:46:0::No value for argument 'first_argument' in function call
+too-many-function-args:47:0::Too many positional arguments for function call
+no-value-for-parameter:49:0::No value for argument 'third_argument' in function call
+no-value-for-parameter:51:0::No value for argument 'first_argument' in function call
+no-value-for-parameter:51:0::No value for argument 'second_argument' in function call
+no-value-for-parameter:51:0::No value for argument 'third_argument' in function call
+too-many-function-args:53:0::Too many positional arguments for function call
+no-value-for-parameter:58:0::No value for argument 'first_argument' in function call
+unexpected-keyword-arg:58:0::Unexpected keyword argument 'bob' in function call
+unexpected-keyword-arg:59:0::Unexpected keyword argument 'coin' in function call
+redundant-keyword-arg:61:0::Argument 'one' passed by position and keyword in function call
+no-value-for-parameter:66:0::No value for argument 'arg' in lambda call
+no-value-for-parameter:71:4:method_tests:No value for argument 'arg' in staticmethod call
+no-value-for-parameter:72:4:method_tests:No value for argument 'arg' in staticmethod call
+no-value-for-parameter:74:4:method_tests:No value for argument 'arg' in classmethod call
+no-value-for-parameter:75:4:method_tests:No value for argument 'arg' in classmethod call
+no-value-for-parameter:77:4:method_tests:No value for argument 'arg' in method call
+no-value-for-parameter:78:4:method_tests:No value for argument 'arg' in unbound method call
+no-value-for-parameter:80:4:method_tests:No value for argument 'arg' in method call
+no-value-for-parameter:81:4:method_tests:No value for argument 'arg' in unbound method call
+no-value-for-parameter:110:8:TestStaticMethod.func:No value for argument 'first' in staticmethod call
+too-many-function-args:111:8:TestStaticMethod.func:Too many positional arguments for staticmethod call
+too-many-function-args:119:8:TypeCheckConstructor.test:Too many positional arguments for constructor call
+no-value-for-parameter:121:8:TypeCheckConstructor.test:No value for argument 'first' in constructor call
+no-value-for-parameter:121:8:TypeCheckConstructor.test:No value for argument 'second' in constructor call
+no-value-for-parameter:122:8:TypeCheckConstructor.test:No value for argument 'second' in constructor call
+unexpected-keyword-arg:122:8:TypeCheckConstructor.test:Unexpected keyword argument 'lala' in constructor call
+no-value-for-parameter:133:8:Test.test:No value for argument 'icon' in method call
+too-many-function-args:134:8:Test.test:Too many positional arguments for method call
+no-value-for-parameter:136:0::No value for argument 'icon' in method call
+no-value-for-parameter:163:4:no_context_but_redefined:No value for argument 'three' in function call
+no-value-for-parameter:163:4:no_context_but_redefined:No value for argument 'two' in function call
+no-value-for-parameter:166:4:no_context_one_elem:No value for argument 'three' in function call
+no-value-for-parameter:166:4:no_context_one_elem:No value for argument 'two' in function call
+unexpected-keyword-arg:202:23:namedtuple_replace_issue_1036:Unexpected keyword argument 'd' in method call
+unexpected-keyword-arg:202:23:namedtuple_replace_issue_1036:Unexpected keyword argument 'e' in method call
+no-value-for-parameter:215:0::No value for argument 'third' in function call
+no-value-for-parameter:216:0::No value for argument 'second' in function call
+unexpected-keyword-arg:217:0::Unexpected keyword argument 'fourth' in function call

tests/functional/a/arguments_differ.txt

@@ -1,6 +1,6 @@
-arguments-differ:12:Child.test:Parameters differ from overridden 'test' method
-arguments-differ:23:ChildDefaults.test:Parameters differ from overridden 'test' method
-arguments-differ:41:ClassmethodChild.func:Parameters differ from overridden 'func' method
-arguments-differ:68:VarargsChild.has_kwargs:Parameters differ from overridden 'has_kwargs' method
-arguments-differ:71:VarargsChild.no_kwargs:Parameters differ from overridden 'no_kwargs' method
-arguments-differ:172:SecondChangesArgs.test:Parameters differ from overridden 'test' method
+arguments-differ:12:4:Child.test:Parameters differ from overridden 'test' method
+arguments-differ:23:4:ChildDefaults.test:Parameters differ from overridden 'test' method
+arguments-differ:41:4:ClassmethodChild.func:Parameters differ from overridden 'func' method
+arguments-differ:68:4:VarargsChild.has_kwargs:Parameters differ from overridden 'has_kwargs' method
+arguments-differ:71:4:VarargsChild.no_kwargs:Parameters differ from overridden 'no_kwargs' method
+arguments-differ:172:4:SecondChangesArgs.test:Parameters differ from overridden 'test' method

tests/functional/a/arguments_differ_py3.txt

@@ -1,5 +1,5 @@
-arguments-differ:25:Foo.kwonly_1:Parameters differ from overridden 'kwonly_1' method
-arguments-differ:28:Foo.kwonly_2:Parameters differ from overridden 'kwonly_2' method
-arguments-differ:31:Foo.kwonly_3:Parameters differ from overridden 'kwonly_3' method
-arguments-differ:34:Foo.kwonly_4:Parameters differ from overridden 'kwonly_4' method
-arguments-differ:37:Foo.kwonly_5:Parameters differ from overridden 'kwonly_5' method
+arguments-differ:25:4:Foo.kwonly_1:Parameters differ from overridden 'kwonly_1' method
+arguments-differ:28:4:Foo.kwonly_2:Parameters differ from overridden 'kwonly_2' method
+arguments-differ:31:4:Foo.kwonly_3:Parameters differ from overridden 'kwonly_3' method
+arguments-differ:34:4:Foo.kwonly_4:Parameters differ from overridden 'kwonly_4' method
+arguments-differ:37:4:Foo.kwonly_5:Parameters differ from overridden 'kwonly_5' method

tests/functional/a/arguments_out_of_order.txt

@@ -1,4 +1,4 @@
-arguments-out-of-order:22:args_out_of_order:Positional arguments appear to be out of order
-arguments-out-of-order:23:args_out_of_order:Positional arguments appear to be out of order
-arguments-out-of-order:25:args_out_of_order:Positional arguments appear to be out of order
-arguments-out-of-order:51:args_out_of_order:Positional arguments appear to be out of order
+arguments-out-of-order:22:4:args_out_of_order:Positional arguments appear to be out of order
+arguments-out-of-order:23:4:args_out_of_order:Positional arguments appear to be out of order
+arguments-out-of-order:25:4:args_out_of_order:Positional arguments appear to be out of order
+arguments-out-of-order:51:4:args_out_of_order:Positional arguments appear to be out of order

tests/functional/a/assert_on_string_literal.txt

@@ -1,2 +1,2 @@
-assert-on-string-literal:3::Assert statement has a string literal as its first argument. The assert will never fail.
-assert-on-string-literal:4::Assert statement has a string literal as its first argument. The assert will always fail.
+assert-on-string-literal:3:0::Assert statement has a string literal as its first argument. The assert will never fail.
+assert-on-string-literal:4:0::Assert statement has a string literal as its first argument. The assert will always fail.

tests/functional/a/assert_on_tuple.txt

@@ -1,2 +1,2 @@
-assert-on-tuple:5::Assert called on a 2-item-tuple. Did you mean 'assert x,y'?
-assert-on-tuple:11::Assert called on a 2-item-tuple. Did you mean 'assert x,y'?
+assert-on-tuple:5:0::Assert called on a 2-item-tuple. Did you mean 'assert x,y'?
+assert-on-tuple:11:0::Assert called on a 2-item-tuple. Did you mean 'assert x,y'?