IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish removal of "slave" terminology

Browse Source 
See issue #234.  It's time.
This commit is contained in:
Zac-HD
2020-06-12 18:00:28 +10:00
parent f23c717a36
commit de3e54fd27
10 changed files with 8 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xdist/workermanage.py
View File

@@ -228,13 +228,9 @@ class WorkerController(object):
self.workerinput = {
"workerid": gateway.id,
"workercount": len(nodemanager.specs),
"slaveid": gateway.id,
"slavecount": len(nodemanager.specs),
"testrunuid": nodemanager.testrunuid,
"mainargv": sys.argv,
}
# TODO: deprecated name, backward compatibility only. Remove it in future
self.slaveinput = self.workerinput
self._down = False
self._shutdown_sent = False
self.log = py.log.Producer("workerctl-%s" % gateway.id)
@@ -333,7 +329,7 @@ class WorkerController(object):
self.notify_inproc(eventname, node=self, **kwargs)
elif eventname == "workerfinished":
self._down = True
self.workeroutput = self.slaveoutput = kwargs["workeroutput"]
self.workeroutput = kwargs["workeroutput"]
self.notify_inproc("workerfinished", node=self)
elif eventname in ("logstart", "logfinish"):
self.notify_inproc(eventname, node=self, **kwargs)