summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudiu Popa <pcmanticore@gmail.com>2019-06-01 11:30:42 +0200
committerClaudiu Popa <pcmanticore@gmail.com>2019-06-01 11:30:42 +0200
commitd14440fe280a25439c76e53455b4831e04c4bb17 (patch)
tree4b6e94b4b6d31f177fc6d79e2d134f1d43455e1a
parent8f8587edff4d30c1437c5ea664bcf52f5715ad01 (diff)
downloadpylint-git-d14440fe280a25439c76e53455b4831e04c4bb17.tar.gz
Now that we support IfExp inference, address a test
-rw-r--r--pylint/test/extensions/data/redefined.py2
-rw-r--r--pylint/test/extensions/test_redefined.py28
2 files changed, 15 insertions, 15 deletions
diff --git a/pylint/test/extensions/data/redefined.py b/pylint/test/extensions/data/redefined.py
index 7db75e8ed..8829c4383 100644
--- a/pylint/test/extensions/data/redefined.py
+++ b/pylint/test/extensions/data/redefined.py
@@ -18,7 +18,7 @@ class MyClass(object):
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 85871b064..da35b0625 100644
--- a/pylint/test/extensions/test_redefined.py
+++ b/pylint/test/extensions/test_redefined.py
@@ -15,15 +15,16 @@ from pylint.extensions.redefined_variable_type import MultipleTypesChecker
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