summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2009-11-18 06:34:46 -0500
committerNed Batchelder <ned@nedbatchelder.com>2009-11-18 06:34:46 -0500
commite24504aa1fab837b6fad7e2d133b313a9665fb26 (patch)
treedd626d66088732d7a3fafb091788497e49429e97
parent688ecb98e29d9eb00e865813534e6e597c2b799d (diff)
downloadpython-coveragepy-git-e24504aa1fab837b6fad7e2d133b313a9665fb26.tar.gz
Dur! This is a better way to indicate how the tests should run.
-rw-r--r--test/coveragetest.py6
-rw-r--r--test/test_cmdline.py4
-rw-r--r--test/test_codeunit.py3
-rw-r--r--test/test_parser.py2
-rw-r--r--test/test_phystokens.py4
-rw-r--r--test/test_results.py4
-rw-r--r--test/test_testing.py4
7 files changed, 10 insertions, 17 deletions
diff --git a/test/coveragetest.py b/test/coveragetest.py
index 972b8042..0fe9806d 100644
--- a/test/coveragetest.py
+++ b/test/coveragetest.py
@@ -23,10 +23,8 @@ class Tee(object):
class CoverageTest(unittest.TestCase):
"""A base class for Coverage test cases."""
- def __init__(self, *args, **kwargs):
- super(CoverageTest, self).__init__(*args, **kwargs)
- self.run_in_temp_dir = True
-
+ run_in_temp_dir = True
+
def setUp(self):
if self.run_in_temp_dir:
# Create a temporary directory.
diff --git a/test/test_cmdline.py b/test/test_cmdline.py
index 7f10dfac..cedcec1d 100644
--- a/test/test_cmdline.py
+++ b/test/test_cmdline.py
@@ -13,9 +13,7 @@ OK, ERR = 0, 1
class CmdLineTest(CoverageTest):
"""Tests of execution paths through the command line interpreter."""
- def setUp(self):
- self.run_in_temp_dir = False
- super(CmdLineTest, self).setUp()
+ run_in_temp_dir = False
INIT_LOAD = """\
.coverage(cover_pylib=None, data_suffix=False, timid=None, branch=None)
diff --git a/test/test_codeunit.py b/test/test_codeunit.py
index bd8f5224..96df9633 100644
--- a/test/test_codeunit.py
+++ b/test/test_codeunit.py
@@ -14,8 +14,9 @@ from coveragetest import CoverageTest
class CodeUnitTest(CoverageTest):
"""Tests for coverage.codeunit"""
+ run_in_temp_dir = False
+
def setUp(self):
- self.run_in_temp_dir = False
super(CodeUnitTest, self).setUp()
# Parent class saves and restores sys.path, we can just modify it.
testmods = self.nice_file(os.path.dirname(__file__), 'modules')
diff --git a/test/test_parser.py b/test/test_parser.py
index 61572be5..3d5726de 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -11,6 +11,8 @@ from coverage.parser import CodeParser
class ParserTest(CoverageTest):
"""Tests for Coverage.py's code parsing."""
+ run_in_temp_dir = False
+
def parse_source(self, text):
"""Parse `text` as source, and return the `CodeParser` used."""
text = textwrap.dedent(text)
diff --git a/test/test_phystokens.py b/test/test_phystokens.py
index ccbdb5a0..fa0fa043 100644
--- a/test/test_phystokens.py
+++ b/test/test_phystokens.py
@@ -26,9 +26,7 @@ HERE = os.path.split(__file__)[0]
class PhysTokensTest(CoverageTest):
"""Tests for Coverage.py's improver tokenizer."""
- def setUp(self):
- self.run_in_temp_dir = False
- super(PhysTokensTest, self).setUp()
+ run_in_temp_dir = False
def check_tokenization(self, source):
"""Tokenize `source`, then put it back together, should be the same."""
diff --git a/test/test_results.py b/test/test_results.py
index ebb66e7a..33ebe4d7 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -11,9 +11,7 @@ from coveragetest import CoverageTest
class NumbersTest(CoverageTest):
"""Tests for Coverage.py's numeric measurement summaries."""
- def setUp(self):
- self.run_in_temp_dir = False
- super(NumbersTest, self).setUp()
+ run_in_temp_dir = False
def test_basic(self):
n1 = Numbers(n_files=1, n_statements=200, n_missing=20)
diff --git a/test/test_testing.py b/test/test_testing.py
index 5e317633..1e22202a 100644
--- a/test/test_testing.py
+++ b/test/test_testing.py
@@ -9,9 +9,7 @@ from coverage.backward import set # pylint: disable-msg=W0622
class TestingTest(CoverageTest):
"""Tests of helper methods on CoverageTest."""
- def setUp(self):
- self.run_in_temp_dir = False
- super(TestingTest, self).setUp()
+ run_in_temp_dir = False
def test_assert_equal_sets(self):
self.assert_equal_sets(set(), set())