diff options
author | Claudiu Popa <cpopa@cloudbasesolutions.com> | 2015-07-03 15:56:09 +0300 |
---|---|---|
committer | Claudiu Popa <cpopa@cloudbasesolutions.com> | 2015-07-03 15:56:09 +0300 |
commit | cbce120cb7fba810860eb4f312b41fe569e95032 (patch) | |
tree | 4ad68d73a70a009ec1cb70584f91d355bf810a88 | |
parent | e7c656d80afbcb6a19775196575bbfeafea117c3 (diff) | |
download | pylint-cbce120cb7fba810860eb4f312b41fe569e95032.tar.gz |
Fix failing test, due to how tox (or drone.io) works: there are multiple copies of pylint installed in different places.
-rw-r--r-- | pylint/test/unittest_pyreverse_inspector.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pylint/test/unittest_pyreverse_inspector.py b/pylint/test/unittest_pyreverse_inspector.py index 34e6978..404fec1 100644 --- a/pylint/test/unittest_pyreverse_inspector.py +++ b/pylint/test/unittest_pyreverse_inspector.py @@ -23,7 +23,6 @@ from astroid import nodes from astroid import bases from astroid import manager from astroid import test_utils -import pkg_resources from pylint.pyreverse import inspector from unittest_pyreverse_writer import get_project @@ -34,11 +33,6 @@ def astroid_wrapper(func, modname): return func(modname) -def find_resources(name): - return pkg_resources.resource_filename( - 'pylint', os.path.join('test', 'data', name)) - - class LinkerTest(unittest.TestCase): def setUp(self): @@ -124,11 +118,9 @@ class LinkerTest(unittest.TestCase): def test_from_directory(self): - p = pkg_resources - resources_location = find_resources('__init__.py') - expected = os.path.normcase(os.path.abspath(resources_location)) + expected = os.path.join('pylint', 'test', 'data', '__init__.py') self.assertEqual(self.project.name, 'data') - self.assertEqual(os.path.normcase(self.project.path), expected) + self.assertTrue(self.project.path.endswith(expected), self.project.path) def test_project_node(self): expected = [ |