refactor all collection related logic

- drop all pickling support (for now)
- perform collection completely ahead of test running (no iterativity)
- introduce new collection related hooks
- shift all keyword-selection code to pytest_keyword plugin
- simplify session object
- besides: fix issue88

--HG--
branch : trunk

Author: hpk42

CHANGELOG

@@ -1,3 +1,10 @@
+
+Changes between 1.3.4 and 1.4.0a1
+==================================================
+
+- major refactoring of internal collection handling
+- fix issue88 (finding custom test nodes from command line arg)
+
 Changes between 1.3.3 and 1.3.4
 ==================================================
 

py/__init__.py

@@ -8,7 +8,7 @@
 
 (c) Holger Krekel and others, 2004-2010
 """
-__version__ = version = "1.3.4"
+__version__ = version = "1.4.0a1"
 
 import py.apipkg
 
@@ -53,7 +53,7 @@
             '_fillfuncargs' : '._test.funcargs:fillfuncargs',
         },
         'cmdline': {
-            'main' : '._test.cmdline:main', # backward compat
+            'main' : '._test.session:main', # backward compat
         },
     },
 

py/_plugin/hookspec.py

@@ -20,13 +20,26 @@ def pytest_configure(config):
         and all plugins and initial conftest files been loaded.
     """
 
+def pytest_cmdline_main(config):
+    """ called for performing the main (cmdline) action. """
+pytest_cmdline_main.firstresult = True
+
 def pytest_unconfigure(config):
     """ called before test process is exited.  """
 
 # -------------------------------------------------------------------------
 # collection hooks
 # -------------------------------------------------------------------------
 
+def pytest_log_startcollection(collection):
+    """ called before collection.perform_collection() is called. """
+
+def pytest_collection_modifyitems(collection):
+    """ called to allow filtering and selecting of test items (inplace). """
+
+def pytest_log_finishcollection(collection):
+    """ called after collection has finished. """
+
 def pytest_ignore_collect(path, config):
     """ return true value to prevent considering this path for collection.
     This hook is consulted for all files and directories prior to considering
@@ -41,9 +54,13 @@ def pytest_collect_directory(path, parent):
 def pytest_collect_file(path, parent):
     """ return Collection node or None for the given path. """
 
+# logging hooks for collection
 def pytest_collectstart(collector):
     """ collector starts collecting. """
 
+def pytest_log_itemcollect(item):
+    """ we just collected a test item. """
+
 def pytest_collectreport(report):
     """ collector finished collecting. """
 
@@ -54,10 +71,6 @@ def pytest_make_collect_report(collector):
     """ perform a collection and return a collection. """
 pytest_make_collect_report.firstresult = True
 
-# XXX rename to item_collected()?  meaning in distribution context?
-def pytest_itemstart(item, node=None):
-    """ test item gets collected. """
-
 # -------------------------------------------------------------------------
 # Python test function related hooks
 # -------------------------------------------------------------------------
@@ -85,6 +98,9 @@ def pytest_generate_tests(metafunc):
 # generic runtest related hooks
 # -------------------------------------------------------------------------
 
+def pytest_itemstart(item, node=None):
+    """ test item starts running. """
+
 def pytest_runtest_protocol(item):
     """ implement fixture, run and report about the given test item. """
 pytest_runtest_protocol.firstresult = True

py/_plugin/pytest__pytest.py

@@ -87,6 +87,28 @@ def getcalls(self, names):
                 l.append(call)
         return l
 
+    def contains(self, entries):
+        from py.builtin import print_
+        i = 0
+        entries = list(entries)
+        backlocals = py.std.sys._getframe(1).f_locals 
+        while entries:
+            name, check = entries.pop(0)
+            for ind, call in enumerate(self.calls[i:]):
+                if call._name == name:
+                    print_("NAMEMATCH", name, call)
+                    if eval(check, backlocals, call.__dict__):
+                        print_("CHECKERMATCH", repr(check), "->", call)
+                    else:
+                        print_("NOCHECKERMATCH", repr(check), "-", call)
+                        continue
+                    i += ind + 1
+                    break
+                print_("NONAMEMATCH", name, "with", call)
+            else:
+                raise AssertionError("could not find %r in %r" %(
+                    name, self.calls[i:]))
+
     def popcall(self, name):
         for i, call in enumerate(self.calls):
             if call._name == name:

py/_plugin/pytest_default.py

@@ -3,6 +3,22 @@
 import sys
 import py
 
+def pytest_cmdline_main(config):
+    from py._test.session import Session, Collection
+    exitstatus = 0
+    if config.option.showfuncargs:
+        from py._test.funcargs import showfuncargs
+        session = showfuncargs(config)
+    else:
+        collection = Collection(config)
+        # instantiate session already because it
+        # records failures and implements maxfail handling
+        session = Session(config, collection)
+        exitstatus = collection.do_collection()
+        if not exitstatus:
+            exitstatus = session.main()
+    return exitstatus
+
 def pytest_pyfunc_call(__multicall__, pyfuncitem):
     if not __multicall__.execute():
         testfunction = pyfuncitem.obj
@@ -16,7 +32,7 @@ def pytest_collect_file(path, parent):
     ext = path.ext
     pb = path.purebasename
     if pb.startswith("test_") or pb.endswith("_test") or \
-       path in parent.config._argfspaths:
+       path in parent.collection._argfspaths:
         if ext == ".py":
             return parent.ihook.pytest_pycollect_makemodule(
                 path=path, parent=parent)
@@ -49,7 +65,7 @@ def pytest_collect_directory(path, parent):
     # define Directory(dir) already
     if not parent.recfilter(path): # by default special ".cvs", ...
         # check if cmdline specified this dir or a subdir directly
-        for arg in parent.config._argfspaths:
+        for arg in parent.collection._argfspaths:
             if path == arg or arg.relto(path):
                 break
         else:
@@ -68,12 +84,6 @@ def pytest_addoption(parser):
     group._addoption('--maxfail', metavar="num",
                action="store", type="int", dest="maxfail", default=0,
                help="exit after first num failures or errors.")
-    group._addoption('-k',
-        action="store", dest="keyword", default='',
-        help="only run test items matching the given "
-             "space separated keywords.  precede a keyword with '-' to negate. "
-             "Terminate the expression with ':' to treat a match as a signal "
-             "to run all subsequent tests. ")
 
     group = parser.getgroup("collect", "collection")
     group.addoption('--collectonly',
@@ -91,17 +101,10 @@ def pytest_addoption(parser):
                help="base temporary directory for this test run.")
 
 def pytest_configure(config):
-    setsession(config)
     # compat
     if config.getvalue("exitfirst"):
         config.option.maxfail = 1
 
-def setsession(config):
-    val = config.getvalue
-    if val("collectonly"):
-        from py._test.session import Session
-        config.setsessionclass(Session)
-
 # pycollect related hooks and code, should move to pytest_pycollect.py
 
 def pytest_pycollect_makeitem(__multicall__, collector, name, obj):

py/_plugin/pytest_keyword.py

@@ -0,0 +1,66 @@
+
+def pytest_addoption(parser):
+    group = parser.getgroup("general")
+    group._addoption('-k',
+        action="store", dest="keyword", default='',
+        help="only run test items matching the given "
+             "space separated keywords.  precede a keyword with '-' to negate. "
+             "Terminate the expression with ':' to treat a match as a signal "
+             "to run all subsequent tests. ")
+
+def pytest_collection_modifyitems(collection):
+    config = collection.config
+    keywordexpr = config.option.keyword
+    if not keywordexpr:
+        return
+    selectuntil = False
+    if keywordexpr[-1] == ":":
+        selectuntil = True
+        keywordexpr = keywordexpr[:-1]
+
+    remaining = []
+    deselected = []
+    for colitem in collection.items:
+        if keywordexpr and skipbykeyword(colitem, keywordexpr):
+            deselected.append(colitem)
+        else:
+            remaining.append(colitem)
+            if selectuntil:
+                keywordexpr = None
+
+    if deselected:
+        config.hook.pytest_deselected(items=deselected)
+    collection.items[:] = remaining
+
+def skipbykeyword(colitem, keywordexpr):
+    """ return True if they given keyword expression means to
+        skip this collector/item.
+    """
+    if not keywordexpr:
+        return
+    chain = colitem.listchain()
+    for key in filter(None, keywordexpr.split()):
+        eor = key[:1] == '-'
+        if eor:
+            key = key[1:]
+        if not (eor ^ matchonekeyword(key, chain)):
+            return True
+
+def matchonekeyword(key, chain):
+    elems = key.split(".")
+    # XXX O(n^2), anyone cares?
+    chain = [item.keywords for item in chain if item.keywords]
+    for start, _ in enumerate(chain):
+        if start + len(elems) > len(chain):
+            return False
+        for num, elem in enumerate(elems):
+            for keyword in chain[num + start]:
+                ok = False
+                if elem in keyword:
+                    ok = True
+                    break
+            if not ok:
+                break
+        if num == len(elems) - 1 and ok:
+            return True
+    return False

py/_plugin/pytest_pytester.py

@@ -74,10 +74,8 @@ def __init__(self, request):
     def __repr__(self):
         return "<TmpTestdir %r>" % (self.tmpdir,)
 
-    def Config(self, topdir=None):
-        if topdir is None:
-            topdir = self.tmpdir.dirpath()
-        return pytestConfig(topdir=topdir)
+    def Config(self):
+        return pytestConfig()
 
     def finalize(self):
         for p in self._syspathremove:
@@ -149,16 +147,23 @@ def mkpydir(self, name):
         p.ensure("__init__.py")
         return p
 
+    def getnode(self, config, arg):
+        from py._test.session import Collection
+        collection = Collection(config)
+        return collection.getbyid(collection._normalizearg(arg))[0]
+
     def genitems(self, colitems):
-        return list(self.session.genitems(colitems))
+        collection = colitems[0].collection
+        result = []
+        collection.genitems(colitems, (), result)
+        return result
 
     def inline_genitems(self, *args):
         #config = self.parseconfig(*args)
-        config = self.parseconfig(*args)
-        session = config.initsession()
+        from py._test.session import Collection
+        config = self.parseconfigure(*args)
         rec = self.getreportrecorder(config)
-        colitems = [config.getnode(arg) for arg in config.args]
-        items = list(session.genitems(colitems))
+        items = Collection(config).perform_collect()
         return items, rec
 
     def runitem(self, source):
@@ -187,11 +192,9 @@ def inline_runsource1(self, *args):
     def inline_run(self, *args):
         args = ("-s", ) + args # otherwise FD leakage
         config = self.parseconfig(*args)
-        config.pluginmanager.do_configure(config)
-        session = config.initsession()
         reprec = self.getreportrecorder(config)
-        colitems = config.getinitialnodes()
-        session.main(colitems)
+        config.pluginmanager.do_configure(config)
+        config.hook.pytest_cmdline_main(config=config)
         config.pluginmanager.do_unconfigure(config)
         return reprec
 
@@ -245,29 +248,17 @@ def getitem(self,  source, funcname="test_func"):
 
     def getitems(self,  source):
         modcol = self.getmodulecol(source)
-        return list(modcol.config.initsession().genitems([modcol]))
-        #assert item is not None, "%r item not found in module:\n%s" %(funcname, source)
-        #return item
-
-    def getfscol(self,  path, configargs=()):
-        self.config = self.parseconfig(path, *configargs)
-        self.session = self.config.initsession()
-        return self.config.getnode(path)
+        return self.genitems([modcol])
 
     def getmodulecol(self,  source, configargs=(), withinit=False):
         kw = {self.request.function.__name__: py.code.Source(source).strip()}
         path = self.makepyfile(**kw)
         if withinit:
             self.makepyfile(__init__ = "#")
-        self.config = self.parseconfig(path, *configargs)
-        self.session = self.config.initsession()
-        #self.config.pluginmanager.do_configure(config=self.config)
-        # XXX
-        self.config.pluginmanager.import_plugin("runner")
-        plugin = self.config.pluginmanager.getplugin("runner")
-        plugin.pytest_configure(config=self.config)
-
-        return self.config.getnode(path)
+        self.config = config = self.parseconfigure(path, *configargs)
+        node = self.getnode(config, path)
+        #config.pluginmanager.do_unconfigure(config)
+        return node
 
     def popen(self, cmdargs, stdout, stderr, **kw):
         if not hasattr(py.std, 'subprocess'):