also un-nest test directory

testing/plugin/__init__.py

@@ -1 +0,0 @@
-#

testing/plugin/conftest.py

@@ -1,36 +0,0 @@
-import py
-
-import _pytest
-plugindir = py.path.local(_pytest.__file__).dirpath()
-from _pytest.core import default_plugins
-
-def pytest_collect_file(path, parent):
-    if path.basename.startswith("pytest_") and path.ext == ".py":
-        mod = parent.Module(path, parent=parent)
-        return mod
-
-# for plugin test we try to automatically make sure that
-# 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'):
-    #        testdir.plugins.append(obj.testplugin)
-    #        break
-    #else:
-    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)
-    #elif modname.startswith("test_pytest"):
-    #    pname = modname[5:]
-    #    assert pname not in testdir.plugins
-    #    testdir.plugins.append(pname)
-    #    #testdir.plugins.append(vars(request.module))
-    else:
-        pass # raise ValueError("need better support code")
-    return testdir
-