remove trailing whitespace everywhere
--HG-- branch : trunk
This commit is contained in:
@@ -11,25 +11,25 @@ def pytest_collect_file(path, parent):
|
||||
return mod
|
||||
|
||||
# for plugin test we try to automatically make sure that
|
||||
# the according plugin is loaded
|
||||
# the according plugin is loaded
|
||||
def pytest_funcarg__testdir(request):
|
||||
testdir = request.getfuncargvalue("testdir")
|
||||
#for obj in (request.cls, request.module):
|
||||
# if hasattr(obj, 'testplugin'):
|
||||
# if hasattr(obj, 'testplugin'):
|
||||
# testdir.plugins.append(obj.testplugin)
|
||||
# break
|
||||
#else:
|
||||
modname = request.module.__name__.split(".")[-1]
|
||||
modname = request.module.__name__.split(".")[-1]
|
||||
if modname.startswith("test_pytest_"):
|
||||
modname = modname[5:]
|
||||
if plugindir.join("%s.py" % modname).check():
|
||||
if modname[7:] not in default_plugins:
|
||||
testdir.plugins.append(vars(request.module))
|
||||
testdir.plugins.append(modname)
|
||||
testdir.plugins.append(modname)
|
||||
#elif modname.startswith("test_pytest"):
|
||||
# pname = modname[5:]
|
||||
# assert pname not in testdir.plugins
|
||||
# testdir.plugins.append(pname)
|
||||
# testdir.plugins.append(pname)
|
||||
# #testdir.plugins.append(vars(request.module))
|
||||
else:
|
||||
pass # raise ValueError("need better support code")
|
||||
|
||||
Reference in New Issue
Block a user