floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove usage of the new module 

--HG--
branch : trunk
This commit is contained in:
Benjamin Peterson 2009-08-29 15:14:18 -05:00
parent b3e8b2f6ab
commit 59892b8532
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/path/local.py
View File

@ -531,7 +531,7 @@ class LocalPath(FSBase):
return sys.modules[modname] return sys.modules[modname]
except KeyError: except KeyError:
# we have a custom modname, do a pseudo-import # we have a custom modname, do a pseudo-import
mod = py.std.new.module(modname) mod = py.std.types.ModuleType(modname)
mod.__file__ = str(self) mod.__file__ = str(self)
sys.modules[modname] = mod sys.modules[modname] = mod
try: try:

8
py/test/testing/test_pluginmanager.py
View File

@ -78,14 +78,14 @@ class TestBootstrapping:
testdir.syspathinsert() testdir.syspathinsert()
testdir.makepyfile(pytest_plug1="#") testdir.makepyfile(pytest_plug1="#")
testdir.makepyfile(pytest_plug2="#") testdir.makepyfile(pytest_plug2="#")
mod = py.std.new.module("temp") mod = py.std.types.ModuleType("temp")
mod.pytest_plugins = ["pytest_plug1", "pytest_plug2"] mod.pytest_plugins = ["pytest_plug1", "pytest_plug2"]
pluginmanager.consider_module(mod) pluginmanager.consider_module(mod)
assert pluginmanager.getplugin("plug1").__name__ == "pytest_plug1" assert pluginmanager.getplugin("plug1").__name__ == "pytest_plug1"
assert pluginmanager.getplugin("plug2").__name__ == "pytest_plug2" assert pluginmanager.getplugin("plug2").__name__ == "pytest_plug2"
def test_consider_module_import_module(self, testdir): def test_consider_module_import_module(self, testdir):
mod = py.std.new.module("x") mod = py.std.types.ModuleType("x")
mod.pytest_plugins = "pytest_a" mod.pytest_plugins = "pytest_a"
aplugin = testdir.makepyfile(pytest_a="#") aplugin = testdir.makepyfile(pytest_a="#")
pluginmanager = PluginManager() pluginmanager = PluginManager()
@ -131,12 +131,12 @@ class TestBootstrapping:
def test_register_imported_modules(self): def test_register_imported_modules(self):
pp = PluginManager() pp = PluginManager()
mod = py.std.new.module("x.y.pytest_hello") mod = py.std.types.ModuleType("x.y.pytest_hello")
pp.register(mod) pp.register(mod)
assert pp.isregistered(mod) assert pp.isregistered(mod)
assert pp.getplugins() == [mod] assert pp.getplugins() == [mod]
py.test.raises(AssertionError, "pp.register(mod)") py.test.raises(AssertionError, "pp.register(mod)")
mod2 = py.std.new.module("pytest_hello") mod2 = py.std.types.ModuleType("pytest_hello")
#pp.register(mod2) # double registry #pp.register(mod2) # double registry
py.test.raises(AssertionError, "pp.register(mod)") py.test.raises(AssertionError, "pp.register(mod)")
#assert not pp.isregistered(mod2) #assert not pp.isregistered(mod2)