summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/backtest.py4
-rw-r--r--tests/test_api.py6
-rw-r--r--tests/test_cmdline.py2
-rw-r--r--tests/test_codeunit.py2
-rw-r--r--tests/test_concurrency.py6
-rw-r--r--tests/test_farm.py3
-rw-r--r--tests/test_misc.py53
-rw-r--r--tests/test_plugins.py52
-rw-r--r--tests/test_process.py2
-rw-r--r--tests/test_summary.py11
-rw-r--r--tests/test_templite.py4
-rw-r--r--tests/test_xml.py2
12 files changed, 73 insertions, 74 deletions
diff --git a/tests/backtest.py b/tests/backtest.py
index 439493d..574e6ac 100644
--- a/tests/backtest.py
+++ b/tests/backtest.py
@@ -1,6 +1,6 @@
"""Add things to old Pythons so I can pretend they are newer, for tests."""
-# pylint: disable=W0622
+# pylint: disable=redefined-builtin
# (Redefining built-in blah)
# The whole point of this file is to redefine built-ins, so shut up about it.
@@ -20,7 +20,7 @@ def run_command(cmd):
stderr=subprocess.STDOUT
)
output, _ = proc.communicate()
- status = proc.returncode # pylint: disable=E1101
+ status = proc.returncode
# Get the output, and canonicalize it to strings with newlines.
if not isinstance(output, str):
diff --git a/tests/test_api.py b/tests/test_api.py
index 31bfc57..ca65d6d 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -448,7 +448,7 @@ class SourceOmitIncludeTest(OmitIncludeTestsMixin, CoverageTest):
"""
cov = coverage.coverage(**kwargs)
cov.start()
- import usepkgs # pragma: nested # pylint: disable=F0401,W0612
+ import usepkgs # pragma: nested # pylint: disable=import-error,unused-variable
cov.stop() # pragma: nested
cov._harvest_data() # private! sshhh...
summary = cov.data.summary()
@@ -487,7 +487,7 @@ class ReportIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest):
"""Try coverage.report()."""
cov = coverage.coverage()
cov.start()
- import usepkgs # pragma: nested # pylint: disable=F0401,W0612
+ import usepkgs # pragma: nested # pylint: disable=import-error,unused-variable
cov.stop() # pragma: nested
report = StringIO()
cov.report(file=report, **kwargs)
@@ -506,7 +506,7 @@ class XmlIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest):
"""Try coverage.xml_report()."""
cov = coverage.coverage()
cov.start()
- import usepkgs # pragma: nested # pylint: disable=F0401,W0612
+ import usepkgs # pragma: nested # pylint: disable=import-error,unused-variable
cov.stop() # pragma: nested
cov.xml_report(outfile="-", **kwargs)
return self.stdout()
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index 80a82d9..b7ab81e 100644
--- a/tests/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -153,7 +153,7 @@ class FakeCoverageForDebugData(object):
"""Fake coverage().data.has_arcs()"""
return False
- def summary(self, fullpath): # pylint: disable=W0613
+ def summary(self, fullpath): # pylint: disable=unused-argument
"""Fake coverage().data.summary()"""
return self._summary
diff --git a/tests/test_codeunit.py b/tests/test_codeunit.py
index fe82ea1..4998126 100644
--- a/tests/test_codeunit.py
+++ b/tests/test_codeunit.py
@@ -7,7 +7,7 @@ from coverage.files import FileLocator
from tests.coveragetest import CoverageTest
-# pylint: disable=F0401
+# pylint: disable=import-error
# Unable to import 'aa' (No module named aa)
class CodeUnitTest(CoverageTest):
diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
index 6fbac4a..02163d2 100644
--- a/tests/test_concurrency.py
+++ b/tests/test_concurrency.py
@@ -10,17 +10,17 @@ from tests.coveragetest import CoverageTest
# These libraries aren't always available, we'll skip tests if they aren't.
try:
- import eventlet # pylint: disable=import-error
+ import eventlet
except ImportError:
eventlet = None
try:
- import gevent # pylint: disable=import-error
+ import gevent
except ImportError:
gevent = None
try:
- import greenlet # pylint: disable=import-error
+ import greenlet
except ImportError:
greenlet = None
diff --git a/tests/test_farm.py b/tests/test_farm.py
index 9e369cf..661c67b 100644
--- a/tests/test_farm.py
+++ b/tests/test_farm.py
@@ -3,7 +3,8 @@
import difflib, filecmp, fnmatch, glob, os, re, shutil, sys
from nose.plugins.skip import SkipTest
-from tests.backtest import run_command, execfile # pylint: disable=W0622
+from tests.backtest import run_command
+from tests.backtest import execfile # pylint: disable=redefined-builtin
from coverage.control import _TEST_NAME_FILE
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 37191f6..a2b39a8 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -2,10 +2,11 @@
import sys
-from coverage.misc import Hasher, file_be_gone
+from coverage.misc import Hasher, file_be_gone, overrides
from coverage import __version__, __url__
from tests.coveragetest import CoverageTest
+
class HasherTest(CoverageTest):
"""Test our wrapper of md5 hashing."""
@@ -79,3 +80,53 @@ class SetupPyTest(CoverageTest):
self.assertGreater(len(long_description), 7)
self.assertNotEqual(long_description[0].strip(), "")
self.assertNotEqual(long_description[-1].strip(), "")
+
+
+class OverridesTest(CoverageTest):
+ """Test plugins.py:overrides."""
+
+ run_in_temp_dir = False
+
+ def test_overrides(self):
+ class SomeBase(object):
+ """Base class, two base methods."""
+ def method1(self):
+ pass
+
+ def method2(self):
+ pass
+
+ class Derived1(SomeBase):
+ """Simple single inheritance."""
+ def method1(self):
+ pass
+
+ self.assertTrue(overrides(Derived1(), "method1", SomeBase))
+ self.assertFalse(overrides(Derived1(), "method2", SomeBase))
+
+ class FurtherDerived1(Derived1):
+ """Derive again from Derived1, inherit its method1."""
+ pass
+
+ self.assertTrue(overrides(FurtherDerived1(), "method1", SomeBase))
+ self.assertFalse(overrides(FurtherDerived1(), "method2", SomeBase))
+
+ class FurtherDerived2(Derived1):
+ """Override the overridden method."""
+ def method1(self):
+ pass
+
+ self.assertTrue(overrides(FurtherDerived2(), "method1", SomeBase))
+ self.assertFalse(overrides(FurtherDerived2(), "method2", SomeBase))
+
+ class Mixin(object):
+ """A mixin that overrides method1."""
+ def method1(self):
+ pass
+
+ class Derived2(Mixin, SomeBase):
+ """A class that gets the method from the mixin."""
+ pass
+
+ self.assertTrue(overrides(Derived2(), "method1", SomeBase))
+ self.assertFalse(overrides(Derived2(), "method2", SomeBase))
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index 83840ea..7c4986a 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -5,7 +5,7 @@ import sys
from nose.plugins.skip import SkipTest
import coverage
-from coverage.plugin import Plugins, overrides
+from coverage.plugin import Plugins
import coverage.plugin
@@ -162,53 +162,3 @@ class PluginTest(CoverageTest):
self.assertEqual(missing, [])
_, statements, _, _ = cov.analysis("/src/try_ABC.zz")
self.assertEqual(statements, [105, 106, 107, 205, 206, 207])
-
-
-class OverridesTest(CoverageTest):
- """Test plugins.py:overrides."""
-
- run_in_temp_dir = False
-
- def test_overrides(self):
- class SomeBase(object):
- """Base class, two base methods."""
- def method1(self):
- pass
-
- def method2(self):
- pass
-
- class Derived1(SomeBase):
- """Simple single inheritance."""
- def method1(self):
- pass
-
- self.assertTrue(overrides(Derived1(), "method1", SomeBase))
- self.assertFalse(overrides(Derived1(), "method2", SomeBase))
-
- class FurtherDerived1(Derived1):
- """Derive again from Derived1, inherit its method1."""
- pass
-
- self.assertTrue(overrides(FurtherDerived1(), "method1", SomeBase))
- self.assertFalse(overrides(FurtherDerived1(), "method2", SomeBase))
-
- class FurtherDerived2(Derived1):
- """Override the overridden method."""
- def method1(self):
- pass
-
- self.assertTrue(overrides(FurtherDerived2(), "method1", SomeBase))
- self.assertFalse(overrides(FurtherDerived2(), "method2", SomeBase))
-
- class Mixin(object):
- """A mixin that overrides method1."""
- def method1(self):
- pass
-
- class Derived2(Mixin, SomeBase):
- """A class that gets the method from the mixin."""
- pass
-
- self.assertTrue(overrides(Derived2(), "method1", SomeBase))
- self.assertFalse(overrides(Derived2(), "method2", SomeBase))
diff --git a/tests/test_process.py b/tests/test_process.py
index ac5c6e1..4584e7d 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -661,7 +661,7 @@ class ProcessStartupTest(CoverageTest):
data_file = .mycovdata
""")
self.set_environ("COVERAGE_PROCESS_START", "coverage.ini")
- import main # pylint: disable=F0401,W0612
+ import main # pylint: disable=import-error,unused-variable
with open("out.txt") as f:
self.assertEqual(f.read(), "Hello, world!\n")
diff --git a/tests/test_summary.py b/tests/test_summary.py
index b52c912..cf255e5 100644
--- a/tests/test_summary.py
+++ b/tests/test_summary.py
@@ -201,7 +201,6 @@ class SummaryTest(CoverageTest):
self.assertEqual(out, 'x\ny\n')
report = self.report_from_command("coverage report --show-missing")
- # pylint: disable=C0301
# Name Stmts Miss Branch BrPart Cover Missing
# -------------------------------------------------------
# main 1 0 0 0 100%
@@ -292,7 +291,7 @@ class SummaryTest(CoverageTest):
self.make_file("mycode.py", "This isn't python at all!")
report = self.report_from_command("coverage report mycode.py")
- # pylint: disable=C0301
+ # pylint: disable=line-too-long
# Name Stmts Miss Cover
# ----------------------------
# mycode NotPython: Couldn't parse '/tmp/test_cover/63354509363/mycode.py' as Python source: 'invalid syntax' at line 1
@@ -358,7 +357,7 @@ class SummaryTest(CoverageTest):
""")
cov = coverage.coverage(branch=True, source=["."])
cov.start()
- import main # pragma: nested # pylint: disable=F0401,W0612
+ import main # pragma: nested # pylint: disable=import-error,unused-variable
cov.stop() # pragma: nested
report = self.get_report(cov).splitlines()
self.assertIn("mybranch 5 5 2 0 0%", report)
@@ -367,7 +366,7 @@ class SummaryTest(CoverageTest):
"""A helper for the next few tests."""
cov = coverage.coverage()
cov.start()
- import TheCode # pragma: nested # pylint: disable=F0401,W0612
+ import TheCode # pragma: nested # pylint: disable=import-error,unused-variable
cov.stop() # pragma: nested
return self.get_report(cov)
@@ -400,7 +399,7 @@ class SummaryTest(CoverageTest):
""")
cov = coverage.coverage()
cov.start()
- import start # pragma: nested # pylint: disable=F0401,W0612
+ import start # pragma: nested # pylint: disable=import-error,unused-variable
cov.stop() # pragma: nested
report = self.get_report(cov)
@@ -430,7 +429,7 @@ class SummaryTest2(CoverageTest):
# statements, not one statement.
cov = coverage.coverage()
cov.start()
- import usepkgs # pragma: nested # pylint: disable=F0401,W0612
+ import usepkgs # pragma: nested # pylint: disable=import-error,unused-variable
cov.stop() # pragma: nested
repout = StringIO()
diff --git a/tests/test_templite.py b/tests/test_templite.py
index aa697b7..b3e21e7 100644
--- a/tests/test_templite.py
+++ b/tests/test_templite.py
@@ -4,9 +4,7 @@ import re
from coverage.templite import Templite, TempliteSyntaxError
from tests.coveragetest import CoverageTest
-# pylint: disable=W0612,E1101
-# Disable W0612 (Unused variable) and
-# E1101 (Instance of 'foo' has no 'bar' member)
+# pylint: disable=unused-variable
class AnyOldObject(object):
"""Simple testing object.
diff --git a/tests/test_xml.py b/tests/test_xml.py
index 37ada3c..3c7d236 100644
--- a/tests/test_xml.py
+++ b/tests/test_xml.py
@@ -80,7 +80,7 @@ class XmlReportTest(CoverageTest):
def test_filename_format_including_module(self):
cov = self.run_doit()
- import sub.doit # pylint: disable=F0401
+ import sub.doit # pylint: disable=import-error
cov.xml_report([sub.doit], outfile="-")
xml = self.stdout()
doit_line = re_line(xml, "class.*doit")
View Lorry Controller Status