move some code around, ending up with fewer files logically grouped

xdist/dsession.py

@@ -199,12 +199,17 @@ class DSession:
             nodeid=nodeid, location=location)
 
     def slave_testreport(self, node, rep):
-        self.sched.remove_item(node, rep.nodeid)
+        if rep.when in ("setup", "call"):
+            self.sched.remove_item(node, rep.nodeid)
         #self.report_line("testreport %s: %s" %(rep.id, rep.status))
         enrich_report_with_platform_data(rep, node)
         self.config.hook.pytest_runtest_logreport(report=rep)
         self._handlefailures(rep)
 
+    def slave_teardownreport(self, node, rep):
+        enrich_report_with_platform_data(rep, node)
+        self.config.hook.pytest__teardown_final_logerror(report=rep)
+
     def slave_collectreport(self, node, rep):
         #self.report_line("collectreport %s: %s" %(rep.id, rep.status))
         #rep.node = node

xdist/looponfail.py

@@ -11,13 +11,12 @@ import py
 import sys
 import execnet
 from py._test.session import gettopdir
-from xdist import util
 
 def looponfail_main(config):
     remotecontrol = RemoteControl(config)
     # XXX better configure rootdir
     rootdirs = [gettopdir(config.args)]
-    statrecorder = util.StatRecorder(rootdirs)
+    statrecorder = StatRecorder(rootdirs)
     try:
         while 1:
             remotecontrol.loop_once()
@@ -191,3 +190,54 @@ class SlaveFailSession:
         topdir = str(self.topdir)
         self.channel.send((topdir, trails, failreports, self.collection_failed))
 
+class StatRecorder:
+    def __init__(self, rootdirlist):
+        self.rootdirlist = rootdirlist
+        self.statcache = {}
+        self.check() # snapshot state
+
+    def fil(self, p):
+        return p.ext in ('.py', '.txt', '.c', '.h')
+    def rec(self, p):
+        return p.check(dotfile=0)
+
+    def waitonchange(self, checkinterval=1.0):
+        while 1:
+            changed = self.check()
+            if changed:
+                return
+            py.std.time.sleep(checkinterval)
+
+    def check(self, removepycfiles=True):
+        changed = False
+        statcache = self.statcache
+        newstat = {}
+        for rootdir in self.rootdirlist:
+            for path in rootdir.visit(self.fil, self.rec):
+                oldstat = statcache.get(path, None)
+                if oldstat is not None:
+                    del statcache[path]
+                try:
+                    newstat[path] = curstat = path.stat()
+                except py.error.ENOENT:
+                    if oldstat:
+                        del statcache[path]
+                        changed = True
+                else:
+                    if oldstat:
+                       if oldstat.mtime != curstat.mtime or \
+                          oldstat.size != curstat.size:
+                            changed = True
+                            py.builtin.print_("# MODIFIED", path)
+                            if removepycfiles and path.ext == ".py":
+                                pycfile = path + "c"
+                                if pycfile.check():
+                                    pycfile.remove()
+
+                    else:
+                        changed = True
+        if statcache:
+            changed = True
+        self.statcache = newstat
+        return changed
+

xdist/remote.py

@@ -26,6 +26,10 @@ class SlaveInteractor:
         for line in str(excrepr).split("\n"):
             self.log("IERROR> " + line)
 
+    def pytest__teardown_final_logerror(self, report):
+        rep = serialize_report(report)
+        self.sendevent("teardownreport", data=rep)
+
     def pytest_sessionstart(self, session):
         self.session = session
         self.collection = session.collection

xdist/slavemanage.py

@@ -295,8 +295,8 @@ class SlaveController(object):
                 self.notify_inproc("slavefinished", node=self)
             #elif eventname == "logstart":
             #    self.notify_inproc(eventname, node=self, **kwargs)
-            elif eventname in ("testreport", "collectreport"):
-                rep = unserialize_report(kwargs['data'])
+            elif eventname in ("testreport", "collectreport", "teardownreport"):
+                rep = unserialize_report(eventname, kwargs['data'])
                 self.notify_inproc(eventname, node=self, rep=rep)
             elif eventname == "collectionfinish":
                 self.notify_inproc(eventname, node=self, ids=kwargs['ids'])
@@ -310,9 +310,11 @@ class SlaveController(object):
             py.builtin.print_("!" * 20, excinfo)
             self.config.pluginmanager.notify_exception(excinfo)
 
-def unserialize_report(reportdict):
+def unserialize_report(name, reportdict):
     d = reportdict
-    if 'result' in d:
-        return runner.CollectReport(**d)
-    else:
+    if name == "testreport":
         return runner.TestReport(**d)
+    elif name == "collectreport":
+        return runner.CollectReport(**d)
+    elif name == "teardownreport":
+        return runner.TeardownErrorReport(**d)

xdist/util.py

@@ -1,53 +0,0 @@
-import py
-
-class StatRecorder:
-    def __init__(self, rootdirlist):
-        self.rootdirlist = rootdirlist
-        self.statcache = {}
-        self.check() # snapshot state
-
-    def fil(self, p):
-        return p.ext in ('.py', '.txt', '.c', '.h')
-    def rec(self, p):
-        return p.check(dotfile=0)
-
-    def waitonchange(self, checkinterval=1.0):
-        while 1:
-            changed = self.check()
-            if changed:
-                return
-            py.std.time.sleep(checkinterval)
-
-    def check(self, removepycfiles=True):
-        changed = False
-        statcache = self.statcache
-        newstat = {}
-        for rootdir in self.rootdirlist:
-            for path in rootdir.visit(self.fil, self.rec):
-                oldstat = statcache.get(path, None)
-                if oldstat is not None:
-                    del statcache[path]
-                try:
-                    newstat[path] = curstat = path.stat()
-                except py.error.ENOENT:
-                    if oldstat:
-                        del statcache[path]
-                        changed = True
-                else:
-                    if oldstat:
-                       if oldstat.mtime != curstat.mtime or \
-                          oldstat.size != curstat.size:
-                            changed = True
-                            py.builtin.print_("# MODIFIED", path)
-                            if removepycfiles and path.ext == ".py":
-                                pycfile = path + "c"
-                                if pycfile.check():
-                                    pycfile.remove()
-
-                    else:
-                        changed = True
-        if statcache:
-            changed = True
-        self.statcache = newstat
-        return changed
-