From 54ceb52eaf1932143ffb23f5e605fba25248c189 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 20 Sep 2017 07:39:03 +0200 Subject: [PATCH] Switch to using Item.get_report() for vulture --- scripts/dev/run_vulture.py | 5 +-- tests/unit/scripts/test_run_vulture.py | 46 ++------------------------ 2 files changed, 3 insertions(+), 48 deletions(-) diff --git a/scripts/dev/run_vulture.py b/scripts/dev/run_vulture.py index 7e5713615..3e88da43b 100755 --- a/scripts/dev/run_vulture.py +++ b/scripts/dev/run_vulture.py @@ -141,10 +141,7 @@ def report(items): output = [] for item in sorted(items, key=lambda e: (e.filename.lower(), e.first_lineno)): - relpath = os.path.relpath(item.filename) - path = relpath if not relpath.startswith('..') else item.filename - output.append("{}:{}: Unused {} '{}'".format(path, item.first_lineno, - item.typ, item.name)) + output.append(item.get_report()) return output diff --git a/tests/unit/scripts/test_run_vulture.py b/tests/unit/scripts/test_run_vulture.py index c19d70b29..2d66d185d 100644 --- a/tests/unit/scripts/test_run_vulture.py +++ b/tests/unit/scripts/test_run_vulture.py @@ -81,50 +81,8 @@ def test_unused_func(vultdir): def foo(): pass """) - assert vultdir.run() == ["foo.py:2: Unused function 'foo'"] - - -def test_unused_var(vultdir): - vultdir.makepyfile(foo=""" - foo = 42 - """) - assert vultdir.run() == ["foo.py:2: Unused variable 'foo'"] - - -def test_unused_attr(vultdir): - vultdir.makepyfile(foo=""" - class Foo(): - def __init__(self): - self.foo = 42 - - Foo() - """) - assert vultdir.run() == ["foo.py:4: Unused attribute 'foo'"] - - -def test_unused_prop(vultdir): - vultdir.makepyfile(foo=""" - class Foo(): - - @property - def foo(self): - return 42 - - Foo() - """) - assert vultdir.run() == ["foo.py:4: Unused property 'foo'"] - - -def test_unused_method(vultdir): - vultdir.makepyfile(foo=""" - class Foo(): - - def foo(self): - pass - - Foo() - """) - assert vultdir.run() == ["foo.py:4: Unused function 'foo'"] + msg = "foo.py:2: unused function 'foo' (60% confidence)" + assert vultdir.run() == [msg] def test_unused_method_camelcase(vultdir):