Removed redundant code; Changed a setup.py test to ensure that the proper setup.py is imported; Changed the 'oddball' tests to use a filename whitelist instead of a blacklist (so that tests run better under instrumental

1 files changed, 4 insertions, 1 deletions

diff --git a/tests/test_oddball.py b/tests/test_oddball.py
index 60fab48..f136eb4 100644
--- a/tests/test_oddball.py
+++ b/tests/test_oddball.py
@@ -306,7 +306,10 @@ class ExceptionTest(CoverageTest):
             lines = cov.data.line_data()
             clean_lines = {}
             for f, llist in lines.items():
-                if f == __file__:
+                # f is a path to a python module, so we drop the '.py' to get
+                # a callname
+                callname = os.path.basename(f)[:-3]
+                if callname not in callnames:
                     # ignore this file.
                     continue
                 clean_lines[os.path.basename(f)] = llist