From c907b2ee1184dbcea1a3698588ad198a32fbea71 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 12 Sep 2020 19:53:31 -0400 Subject: ambigious -> ambiguous --- tests/modules/ambigious/__init__.py | 0 tests/modules/ambigious/pkg1/__init__.py | 1 - tests/modules/ambigious/pkg1/ambigious.py | 2 -- tests/modules/ambiguous/__init__.py | 0 tests/modules/ambiguous/pkg1/__init__.py | 1 + tests/modules/ambiguous/pkg1/ambiguous.py | 2 ++ tests/modules/usepkgs.py | 2 +- tests/test_api.py | 18 +++++++++--------- 8 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 tests/modules/ambigious/__init__.py delete mode 100644 tests/modules/ambigious/pkg1/__init__.py delete mode 100644 tests/modules/ambigious/pkg1/ambigious.py create mode 100644 tests/modules/ambiguous/__init__.py create mode 100644 tests/modules/ambiguous/pkg1/__init__.py create mode 100644 tests/modules/ambiguous/pkg1/ambiguous.py diff --git a/tests/modules/ambigious/__init__.py b/tests/modules/ambigious/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/modules/ambigious/pkg1/__init__.py b/tests/modules/ambigious/pkg1/__init__.py deleted file mode 100644 index 59742bbb..00000000 --- a/tests/modules/ambigious/pkg1/__init__.py +++ /dev/null @@ -1 +0,0 @@ -print("Ambiguous pkg1") diff --git a/tests/modules/ambigious/pkg1/ambigious.py b/tests/modules/ambigious/pkg1/ambigious.py deleted file mode 100644 index 6048d6da..00000000 --- a/tests/modules/ambigious/pkg1/ambigious.py +++ /dev/null @@ -1,2 +0,0 @@ -amb = 1 -amb = 2 diff --git a/tests/modules/ambiguous/__init__.py b/tests/modules/ambiguous/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/modules/ambiguous/pkg1/__init__.py b/tests/modules/ambiguous/pkg1/__init__.py new file mode 100644 index 00000000..59742bbb --- /dev/null +++ b/tests/modules/ambiguous/pkg1/__init__.py @@ -0,0 +1 @@ +print("Ambiguous pkg1") diff --git a/tests/modules/ambiguous/pkg1/ambiguous.py b/tests/modules/ambiguous/pkg1/ambiguous.py new file mode 100644 index 00000000..6048d6da --- /dev/null +++ b/tests/modules/ambiguous/pkg1/ambiguous.py @@ -0,0 +1,2 @@ +amb = 1 +amb = 2 diff --git a/tests/modules/usepkgs.py b/tests/modules/usepkgs.py index 2e4d21a7..7b42976d 100644 --- a/tests/modules/usepkgs.py +++ b/tests/modules/usepkgs.py @@ -5,4 +5,4 @@ import pkg1.p1a, pkg1.p1b, pkg1.sub import pkg2.p2a, pkg2.p2b import othermods.othera, othermods.otherb import othermods.sub.osa, othermods.sub.osb -import ambigious, ambigious.pkg1.ambigious +import ambiguous, ambiguous.pkg1.ambiguous diff --git a/tests/test_api.py b/tests/test_api.py index a28d0133..e2a2a555 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -935,20 +935,20 @@ class SourceIncludeOmitTest(IncludeOmitTestsMixin, CoverageTest): self.filenames_not_in(lines, "p1b") self.assertEqual(lines['p1c'], 0) - def test_ambigious_source_package_as_dir(self): - # pkg1 is a directory and a pkg, since we cd into tests/modules/ambigious - self.chdir(self.nice_file(TESTS_DIR, 'modules', "ambigious")) - # pkg1 defaults to directory because tests/modules/ambigious/pkg1 exists + def test_ambiguous_source_package_as_dir(self): + # pkg1 is a directory and a pkg, since we cd into tests/modules/ambiguous + self.chdir(self.nice_file(TESTS_DIR, 'modules', "ambiguous")) + # pkg1 defaults to directory because tests/modules/ambiguous/pkg1 exists lines = self.coverage_usepkgs(source=["pkg1"]) - self.filenames_in(lines, "ambigious") + self.filenames_in(lines, "ambiguous") self.filenames_not_in(lines, "p1a p1b p1c") - def test_ambigious_source_package_as_package(self): - # pkg1 is a directory and a pkg, since we cd into tests/modules/ambigious - self.chdir(self.nice_file(TESTS_DIR, 'modules', "ambigious")) + def test_ambiguous_source_package_as_package(self): + # pkg1 is a directory and a pkg, since we cd into tests/modules/ambiguous + self.chdir(self.nice_file(TESTS_DIR, 'modules', "ambiguous")) lines = self.coverage_usepkgs(source_pkgs=["pkg1"]) self.filenames_in(lines, "p1a p1b") - self.filenames_not_in(lines, "p2a p2b othera otherb osa osb ambigious") + self.filenames_not_in(lines, "p2a p2b othera otherb osa osb ambiguous") # Because source= was specified, we do search for unexecuted files. self.assertEqual(lines['p1c'], 0) -- cgit v1.2.1