From d14440fe280a25439c76e53455b4831e04c4bb17 Mon Sep 17 00:00:00 2001 From: Claudiu Popa Date: Sat, 1 Jun 2019 11:30:42 +0200 Subject: [PATCH] Now that we support IfExp inference, address a test --- pylint/test/extensions/data/redefined.py | 2 +- pylint/test/extensions/test_redefined.py | 28 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pylint/test/extensions/data/redefined.py b/pylint/test/extensions/data/redefined.py index 7db75e8ed6..8829c4383c 100644 --- a/pylint/test/extensions/data/redefined.py +++ b/pylint/test/extensions/data/redefined.py @@ -18,7 +18,7 @@ def __init__(self): self.a_str = "hello" a_str = False (a_str, b_str) = (1, 2) # no support for inference on tuple assignment - a_str = 2.0 if self.var else 1.0 # no support for inference on ifexpr + a_str = 2.0 if self.var else 1.0 def _getter(self): return self.a_str diff --git a/pylint/test/extensions/test_redefined.py b/pylint/test/extensions/test_redefined.py index 85871b064f..da35b06253 100644 --- a/pylint/test/extensions/test_redefined.py +++ b/pylint/test/extensions/test_redefined.py @@ -15,15 +15,16 @@ from pylint.lint import fix_import_path EXPECTED = [ - 'Redefinition of self.var1 type from int to float', - 'Redefinition of var type from int to str', - 'Redefinition of myint type from int to bool', - 'Redefinition of _OK type from bool to str', - 'Redefinition of instance type from redefined.MyClass to bool', - 'Redefinition of SOME_FLOAT type from float to int', - 'Redefinition of var3 type from str to int', - 'Redefinition of var type from bool to int', - 'Redefinition of var4 type from float to str', + "Redefinition of self.var1 type from int to float", + "Redefinition of a_str type from bool to float", + "Redefinition of var type from int to str", + "Redefinition of myint type from int to bool", + "Redefinition of _OK type from bool to str", + "Redefinition of instance type from redefined.MyClass to bool", + "Redefinition of SOME_FLOAT type from float to int", + "Redefinition of var3 type from str to int", + "Redefinition of var type from bool to int", + "Redefinition of var4 type from float to str", ] @@ -34,16 +35,15 @@ def checker(checker): @pytest.fixture(scope="module") def disable(disable): - return ['I'] + return ["I"] def test_types_redefined(linter): - elif_test = osp.join(osp.dirname(osp.abspath(__file__)), 'data', - 'redefined.py') + elif_test = osp.join(osp.dirname(osp.abspath(__file__)), "data", "redefined.py") with fix_import_path([elif_test]): linter.check([elif_test]) msgs = sorted(linter.reporter.messages, key=lambda item: item.line) - assert len(msgs) == 9 + assert len(msgs) == 10 for msg, expected in zip(msgs, EXPECTED): - assert msg.symbol == 'redefined-variable-type' + assert msg.symbol == "redefined-variable-type" assert msg.msg == expected