summaryrefslogtreecommitdiff
path: root/pkg_resources/tests
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-01-04 12:22:53 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-01-04 12:22:53 -0500
commitfba8ee7abecb12726293438e8af19d7c3fa54bb8 (patch)
tree2b2c2c3e01a8385fefd7dca2d425d3a1abe3aa04 /pkg_resources/tests
parent3593a64ed6755876702ce362e1dfc87849c0952b (diff)
downloadpython-setuptools-git-fba8ee7abecb12726293438e8af19d7c3fa54bb8.tar.gz
Remove try/except/fail - Exceptions are failures by default.
Diffstat (limited to 'pkg_resources/tests')
-rw-r--r--pkg_resources/tests/test_resources.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 6cc3de0b..82a987b7 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -593,10 +593,8 @@ class TestNamespaces:
pkg2_init.close()
import pkg1
assert "pkg1" in pkg_resources._namespace_packages
- try:
- import pkg1.pkg2
- except ImportError:
- self.fail("Setuptools tried to import the parent namespace package")
+ # attempt to import pkg2 from site-pkgs2
+ import pkg1.pkg2
# check the _namespace_packages dict
assert "pkg1.pkg2" in pkg_resources._namespace_packages
assert pkg_resources._namespace_packages["pkg1"] == ["pkg1.pkg2"]