diff options
| author | Marc Abramowitz <marc@marc-abramowitz.com> | 2012-07-07 09:27:36 -0700 |
|---|---|---|
| committer | Marc Abramowitz <marc@marc-abramowitz.com> | 2012-07-07 09:27:36 -0700 |
| commit | afb29fd79ca4275bbd427ba5c1a0633dec0ae21d (patch) | |
| tree | 702a9142ced05c39a6bcaf2ef219a573a79311df /test | |
| parent | 4c2f4e949ed4e3cb559fad2d635d2e191dc2f2b2 (diff) | |
| parent | 07b188473f945262949a5ce0cf3ee7b1e943a6ee (diff) | |
| download | python-coveragepy-git-afb29fd79ca4275bbd427ba5c1a0633dec0ae21d.tar.gz | |
Merge with upstream changes
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_files.py | 3 | ||||
| -rw-r--r-- | test/test_oddball.py | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/test/test_files.py b/test/test_files.py index a00a9680..d45f5973 100644 --- a/test/test_files.py +++ b/test/test_files.py @@ -147,7 +147,6 @@ class FindPythonFilesTest(CoverageTest): def test_find_python_files(self): self.make_file("sub/a.py") self.make_file("sub/b.py") - self.make_file("sub/__init__.py") self.make_file("sub/x.c") # nope: not .py self.make_file("sub/ssub/__init__.py") self.make_file("sub/ssub/s.py") @@ -155,7 +154,7 @@ class FindPythonFilesTest(CoverageTest): self.make_file("sub/lab/exp.py") # nope: no __init__.py py_files = set(find_python_files("sub")) self.assert_same_files(py_files, [ - "sub/__init__.py", "sub/a.py", "sub/b.py", + "sub/a.py", "sub/b.py", "sub/ssub/__init__.py", "sub/ssub/s.py", ]) diff --git a/test/test_oddball.py b/test/test_oddball.py index 859648fa..1a3bd22f 100644 --- a/test/test_oddball.py +++ b/test/test_oddball.py @@ -129,7 +129,13 @@ class RecursionTest(CoverageTest): class MemoryLeakTest(CoverageTest): - """Attempt the impossible: test that memory doesn't leak.""" + """Attempt the impossible: test that memory doesn't leak. + + Note: this test is truly unusual, and may fail unexpectedly. + In particular, it is known to fail on PyPy if test_oddball.py is run in + isolation: https://bitbucket.org/ned/coveragepy/issue/186 + + """ def test_for_leaks(self): lines = list(range(301, 315)) |