From d7d396a7f913d5dbf1cc5c2f6141ba20ae697e12 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 5 Nov 2022 12:01:07 -0300 Subject: [PATCH] Run pyupgrade --py37-plus --- src/xdist/dsession.py | 12 +++++------- src/xdist/looponfail.py | 2 +- src/xdist/remote.py | 2 +- src/xdist/scheduler/loadscope.py | 4 ++-- src/xdist/workermanage.py | 16 ++++++++-------- testing/test_remote.py | 4 ++-- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/xdist/dsession.py b/src/xdist/dsession.py index ab8332f..4cea59b 100644 --- a/src/xdist/dsession.py +++ b/src/xdist/dsession.py @@ -169,7 +169,7 @@ class DSession: """ self.config.hook.pytest_testnodedown(node=node, error=None) if node.workeroutput["exitstatus"] == 2: # keyboard-interrupt - self.shouldstop = "{} received keyboard-interrupt".format(node) + self.shouldstop = f"{node} received keyboard-interrupt" self.worker_errordown(node, "keyboard-interrupt") return if node in self.sched.nodes: @@ -230,7 +230,7 @@ class DSession: @pytest.hookimpl def pytest_terminal_summary(self, terminalreporter): if self.config.option.verbose >= 0 and self._summary_report: - terminalreporter.write_sep("=", "xdist: {}".format(self._summary_report)) + terminalreporter.write_sep("=", f"xdist: {self._summary_report}") def worker_collectionfinish(self, node, ids): """worker has finished test collection. @@ -345,7 +345,7 @@ class DSession: # XXX count no of failures and retry N times runner = self.config.pluginmanager.getplugin("runner") fspath = nodeid.split("::")[0] - msg = "worker {!r} crashed while running {!r}".format(worker.gateway.id, nodeid) + msg = f"worker {worker.gateway.id!r} crashed while running {nodeid!r}" rep = runner.TestReport( nodeid, (fspath, None, fspath), (), "failed", msg, "???" ) @@ -381,9 +381,7 @@ class TerminalDistReporter: def getstatus(self): if self.config.option.verbose >= 0: - parts = [ - "{} {}".format(spec.id, self._status[spec.id]) for spec in self._specs - ] + parts = [f"{spec.id} {self._status[spec.id]}" for spec in self._specs] return " / ".join(parts) else: return "bringing up nodes..." @@ -431,7 +429,7 @@ class TerminalDistReporter: def pytest_testnodedown(self, node, error): if not error: return - self.write_line("[{}] node down: {}".format(node.gateway.id, error)) + self.write_line(f"[{node.gateway.id}] node down: {error}") def get_default_max_worker_restart(config): diff --git a/src/xdist/looponfail.py b/src/xdist/looponfail.py index 77eff04..59ba7eb 100644 --- a/src/xdist/looponfail.py +++ b/src/xdist/looponfail.py @@ -146,7 +146,7 @@ def repr_pytest_looponfailinfo(failreports, rootdirs): tr.line(report, red=True) tr.sep("#", "waiting for changes", bold=True) for rootdir in rootdirs: - tr.line("### Watching: {}".format(rootdir), bold=True) + tr.line(f"### Watching: {rootdir}", bold=True) def init_worker_session(channel, args, option_dict): diff --git a/src/xdist/remote.py b/src/xdist/remote.py index 5d0c899..1d2f676 100644 --- a/src/xdist/remote.py +++ b/src/xdist/remote.py @@ -149,7 +149,7 @@ class WorkerInteractor: if len(mark.args) > 0 else mark.kwargs.get("name", "default") ) - item._nodeid = "{}@{}".format(item.nodeid, gname) + item._nodeid = f"{item.nodeid}@{gname}" @pytest.hookimpl def pytest_collection_finish(self, session): diff --git a/src/xdist/scheduler/loadscope.py b/src/xdist/scheduler/loadscope.py index fabe1eb..ad99125 100644 --- a/src/xdist/scheduler/loadscope.py +++ b/src/xdist/scheduler/loadscope.py @@ -361,12 +361,12 @@ class LoadScopeScheduling: extra_nodes = len(self.nodes) - len(self.workqueue) if extra_nodes > 0: - self.log("Shutting down {} nodes".format(extra_nodes)) + self.log(f"Shutting down {extra_nodes} nodes") for _ in range(extra_nodes): unused_node, assigned = self.assigned_work.popitem(last=True) - self.log("Shutting down unused node {}".format(unused_node)) + self.log(f"Shutting down unused node {unused_node}") unused_node.shutdown() # Assign initial workload diff --git a/src/xdist/workermanage.py b/src/xdist/workermanage.py index a940b84..10f681c 100644 --- a/src/xdist/workermanage.py +++ b/src/xdist/workermanage.py @@ -112,7 +112,7 @@ class NodeManager: for root in candidates: root = Path(root).resolve() if not root.exists(): - raise pytest.UsageError("rsyncdir doesn't exist: {!r}".format(root)) + raise pytest.UsageError(f"rsyncdir doesn't exist: {root!r}") if root not in roots: roots.append(root) return roots @@ -192,7 +192,7 @@ class HostRSync(execnet.RSync): if self._verbose > 0: path = os.path.basename(self._sourcedir) + "/" + modified_rel_path remotepath = gateway.spec.chdir - print("{}:{} <= {}".format(gateway.spec, remotepath, path)) + print(f"{gateway.spec}:{remotepath} <= {path}") def make_reltoroot(roots: Sequence[Path], args: List[str]) -> List[str]: @@ -219,7 +219,7 @@ def make_reltoroot(roots: Sequence[Path], args: List[str]) -> List[str]: parts[0] = root.name + "/" + str(x) break else: - raise ValueError("arg {} not relative to an rsync root".format(arg)) + raise ValueError(f"arg {arg} not relative to an rsync root") result.append(splitcode.join(parts)) return result @@ -249,7 +249,7 @@ class WorkerController: self.log = Producer(f"workerctl-{gateway.id}", enabled=config.option.debug) def __repr__(self): - return "<{} {}>".format(self.__class__.__name__, self.gateway.id) + return f"<{self.__class__.__name__} {self.gateway.id}>" @property def shutting_down(self): @@ -310,11 +310,11 @@ class WorkerController: def sendcommand(self, name, **kwargs): """send a named parametrized command to the other side.""" - self.log("sending command {}(**{})".format(name, kwargs)) + self.log(f"sending command {name}(**{kwargs})") self.channel.send((name, kwargs)) def notify_inproc(self, eventname, **kwargs): - self.log("queuing {}(**{})".format(eventname, kwargs)) + self.log(f"queuing {eventname}(**{kwargs})") self.putevent((eventname, kwargs)) def process_from_remote(self, eventcall): # noqa too complex @@ -336,7 +336,7 @@ class WorkerController: return eventname, kwargs = eventcall if eventname in ("collectionstart",): - self.log("ignoring {}({})".format(eventname, kwargs)) + self.log(f"ignoring {eventname}({kwargs})") elif eventname == "workerready": self.notify_inproc(eventname, node=self, **kwargs) elif eventname == "internal_error": @@ -389,7 +389,7 @@ class WorkerController: location=kwargs["location"], ) else: - raise ValueError("unknown event: {}".format(eventname)) + raise ValueError(f"unknown event: {eventname}") except KeyboardInterrupt: # should not land in receiver-thread raise diff --git a/testing/test_remote.py b/testing/test_remote.py index 8a44b73..ddfed9e 100644 --- a/testing/test_remote.py +++ b/testing/test_remote.py @@ -25,7 +25,7 @@ class EventCall: self.name, self.kwargs = eventcall def __str__(self): - return "".format(self.name, self.kwargs) + return f"" class WorkerSetup: @@ -60,7 +60,7 @@ class WorkerSetup: ev = EventCall(data) if name is None or ev.name == name: return ev - print("skipping {}".format(ev)) + print(f"skipping {ev}") def sendcommand(self, name, **kwargs): self.slp.sendcommand(name, **kwargs)