From 3ff1e3d62896b4775320eb38149c775909fe6ce4 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 6 Oct 2013 17:41:21 +0100 Subject: Revert patch from Jannis Merging this breaks test suite for cliapp. I don't know why. --- CoverageTestRunner.py | 2 +- NEWS | 7 ------- subdir/__init__.py | 2 -- subdir/foo_tests.py | 4 +--- .../modules_with_same_names_but_different_symbols/__init__.py | 2 -- .../module1/__init__.py | 1 - .../module1/duplicate.py | 4 ---- .../module1/duplicate_tests.py | 11 ----------- .../module2/__init__.py | 1 - .../module2/duplicate.py | 4 ---- .../module2/duplicate_tests.py | 11 ----------- test-excluded | 5 +---- 12 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 subdir/__init__.py delete mode 100644 subdir/modules_with_same_names_but_different_symbols/__init__.py delete mode 100644 subdir/modules_with_same_names_but_different_symbols/module1/__init__.py delete mode 100644 subdir/modules_with_same_names_but_different_symbols/module1/duplicate.py delete mode 100644 subdir/modules_with_same_names_but_different_symbols/module1/duplicate_tests.py delete mode 100644 subdir/modules_with_same_names_but_different_symbols/module2/__init__.py delete mode 100644 subdir/modules_with_same_names_but_different_symbols/module2/duplicate.py delete mode 100644 subdir/modules_with_same_names_but_different_symbols/module2/duplicate_tests.py diff --git a/CoverageTestRunner.py b/CoverageTestRunner.py index 6500041..88987a1 100644 --- a/CoverageTestRunner.py +++ b/CoverageTestRunner.py @@ -158,7 +158,7 @@ class CoverageTestRunner: for tuple in imp.get_suffixes(): suffix, mode, type = tuple if pathname.endswith(suffix): - name = pathname[:-len(suffix)] + name = os.path.basename(pathname[:-len(suffix)]) f = file(pathname, mode) return imp.load_module(name, f, pathname, tuple) raise Exception("Unknown module: %s" % pathname) diff --git a/NEWS b/NEWS index bdad02c..0f56811 100644 --- a/NEWS +++ b/NEWS @@ -1,13 +1,6 @@ NEWS about CoverageTestRunner ============================= -Version 1.11, released UNRELEASED --------------------------------- - -* Bug fix from Jannis Pohlmann: Previously, CoverageTestRunner - would often (possibly always) treat modules with the same - basename as the same module. - Version 1.10, released 2013-04-17 -------------------------------- diff --git a/subdir/__init__.py b/subdir/__init__.py deleted file mode 100644 index cd02b72..0000000 --- a/subdir/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -import foo -import modules_with_same_names_but_different_symbols diff --git a/subdir/foo_tests.py b/subdir/foo_tests.py index ce10d5c..a8a9740 100644 --- a/subdir/foo_tests.py +++ b/subdir/foo_tests.py @@ -1,6 +1,4 @@ -import unittest - -from subdir import foo +import unittest, foo class FooTests(unittest.TestCase): diff --git a/subdir/modules_with_same_names_but_different_symbols/__init__.py b/subdir/modules_with_same_names_but_different_symbols/__init__.py deleted file mode 100644 index 909cf90..0000000 --- a/subdir/modules_with_same_names_but_different_symbols/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -import module1 -import module2 diff --git a/subdir/modules_with_same_names_but_different_symbols/module1/__init__.py b/subdir/modules_with_same_names_but_different_symbols/module1/__init__.py deleted file mode 100644 index e1dd07e..0000000 --- a/subdir/modules_with_same_names_but_different_symbols/module1/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import duplicate diff --git a/subdir/modules_with_same_names_but_different_symbols/module1/duplicate.py b/subdir/modules_with_same_names_but_different_symbols/module1/duplicate.py deleted file mode 100644 index 02aa6a1..0000000 --- a/subdir/modules_with_same_names_but_different_symbols/module1/duplicate.py +++ /dev/null @@ -1,4 +0,0 @@ -class DuplicateClass(object): - - def a_function(self): - return True diff --git a/subdir/modules_with_same_names_but_different_symbols/module1/duplicate_tests.py b/subdir/modules_with_same_names_but_different_symbols/module1/duplicate_tests.py deleted file mode 100644 index 232c510..0000000 --- a/subdir/modules_with_same_names_but_different_symbols/module1/duplicate_tests.py +++ /dev/null @@ -1,11 +0,0 @@ -import unittest - -from subdir.modules_with_same_names_but_different_symbols.module1 \ - import duplicate - - -class DuplicateClassTests(unittest.TestCase): - - def test_a_function_works(self): - o = duplicate.DuplicateClass() - self.assertEqual(o.a_function(), True) diff --git a/subdir/modules_with_same_names_but_different_symbols/module2/__init__.py b/subdir/modules_with_same_names_but_different_symbols/module2/__init__.py deleted file mode 100644 index e1dd07e..0000000 --- a/subdir/modules_with_same_names_but_different_symbols/module2/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import duplicate diff --git a/subdir/modules_with_same_names_but_different_symbols/module2/duplicate.py b/subdir/modules_with_same_names_but_different_symbols/module2/duplicate.py deleted file mode 100644 index 75ea503..0000000 --- a/subdir/modules_with_same_names_but_different_symbols/module2/duplicate.py +++ /dev/null @@ -1,4 +0,0 @@ -class DifferentClass(object): - - def a_function(self): - return True diff --git a/subdir/modules_with_same_names_but_different_symbols/module2/duplicate_tests.py b/subdir/modules_with_same_names_but_different_symbols/module2/duplicate_tests.py deleted file mode 100644 index dd3abf4..0000000 --- a/subdir/modules_with_same_names_but_different_symbols/module2/duplicate_tests.py +++ /dev/null @@ -1,11 +0,0 @@ -import unittest - -from subdir.modules_with_same_names_but_different_symbols.module2 \ - import duplicate - - -class DifferentClassTests(unittest.TestCase): - - def test_a_function_works(self): - o = duplicate.DifferentClass() - self.assertEqual(o.a_function(), True) diff --git a/test-excluded b/test-excluded index 6314bf9..2835413 100644 --- a/test-excluded +++ b/test-excluded @@ -1,5 +1,2 @@ -subdir/__init__.py subdir/bar.py -subdir/modules_with_same_names_but_different_symbols/module1/__init__.py -subdir/modules_with_same_names_but_different_symbols/module2/__init__.py -subdir/modules_with_same_names_but_different_symbols/__init__.py + -- cgit v1.2.1