From c3ec2718a2969beb0059099d61b5f928ed5013a5 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Mon, 1 Nov 2010 00:38:44 +0100 Subject: [PATCH] fix tests by using less likely existing import names --- pytest/plugin/session.py | 2 -- testing/test_pluginmanager.py | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pytest/plugin/session.py b/pytest/plugin/session.py index 8ed9f6205..759b36cff 100644 --- a/pytest/plugin/session.py +++ b/pytest/plugin/session.py @@ -295,8 +295,6 @@ class HookProxy: def __init__(self, node): self.node = node def __getattr__(self, name): - if name[0] == "_": - raise AttributeError(name) hookmethod = getattr(self.node.config.hook, name) def call_matching_hooks(**kwargs): plugins = self.node.config._getmatchingplugins(self.node.fspath) diff --git a/testing/test_pluginmanager.py b/testing/test_pluginmanager.py index 7570795bd..1200b592e 100644 --- a/testing/test_pluginmanager.py +++ b/testing/test_pluginmanager.py @@ -85,8 +85,8 @@ class TestBootstrapping: def test_import_plugin_importname(self, testdir): pluginmanager = PluginManager() - py.test.raises(ImportError, 'pluginmanager.import_plugin("x.y")') - py.test.raises(ImportError, 'pluginmanager.import_plugin("pytest_x.y")') + py.test.raises(ImportError, 'pluginmanager.import_plugin("qweqwex.y")') + py.test.raises(ImportError, 'pluginmanager.import_plugin("pytest_qweqwx.y")') reset = testdir.syspathinsert() pluginname = "pytest_hello" @@ -103,8 +103,8 @@ class TestBootstrapping: def test_import_plugin_dotted_name(self, testdir): pluginmanager = PluginManager() - py.test.raises(ImportError, 'pluginmanager.import_plugin("x.y")') - py.test.raises(ImportError, 'pluginmanager.import_plugin("pytest_x.y")') + py.test.raises(ImportError, 'pluginmanager.import_plugin("qweqwex.y")') + py.test.raises(ImportError, 'pluginmanager.import_plugin("pytest_qweqwex.y")') reset = testdir.syspathinsert() testdir.mkpydir("pkg").join("plug.py").write("x=3")