diff --git a/bazel/labgrid/strategy/BUILD.bazel b/bazel/labgrid/strategy/BUILD.bazel index 61fa29fc5fd716c2f93a288bad067b3f0556ecbf..43ba4cb69cf9a18220837b2cf0cba65eff180fcf 100644 --- a/bazel/labgrid/strategy/BUILD.bazel +++ b/bazel/labgrid/strategy/BUILD.bazel @@ -3,13 +3,13 @@ load("@rules_python//python:defs.bzl", "py_library", "py_test") py_library( name = "strategy", srcs = [ - "qemu/strategy.py", "__init__.py", + "qemu/strategy.py", ], + visibility = ["//visibility:public"], deps = [ - "//labgrid:pkg" + "//labgrid:pkg", ], - visibility = ["//visibility:public"], ) py_test( diff --git a/bazel/labgrid/strategy/qemu/strategy.py b/bazel/labgrid/strategy/qemu/strategy.py index ef4be44282e61a74e173520bfcd97b693fb5fe9b..28b071fa1ca22c6395fad461f5cb703d44ec7b19 100644 --- a/bazel/labgrid/strategy/qemu/strategy.py +++ b/bazel/labgrid/strategy/qemu/strategy.py @@ -2,11 +2,11 @@ import enum import attr -from labgrid.step import step -from labgrid.strategy import Strategy, StrategyError from labgrid.driver.qemudriver import QEMUDriver from labgrid.driver.shelldriver import ShellDriver from labgrid.factory import target_factory +from labgrid.step import step +from labgrid.strategy import Strategy, StrategyError class Status(enum.Enum): @@ -17,10 +17,7 @@ class Status(enum.Enum): @target_factory.reg_driver class QEMUStrategy(Strategy): - bindings = { - "qemu": QEMUDriver, - "shell": ShellDriver - } + bindings = {"qemu": QEMUDriver, "shell": ShellDriver} status = attr.ib(default=Status.unknown) @@ -49,7 +46,5 @@ class QEMUStrategy(Strategy): # Wait until booted self.target.activate(self.shell) else: - raise StrategyError( - f"no transition found from {self.status} to {status}" - ) + raise StrategyError(f"no transition found from {self.status} to {status}") self.status = status diff --git a/labgrid/executor/executor.py b/labgrid/executor/executor.py index b5a0738b70219611165c01eb15b37eca0675dde8..9cc59d60354e3cd9a3dda663bd3c9b01448e4b92 100644 --- a/labgrid/executor/executor.py +++ b/labgrid/executor/executor.py @@ -14,6 +14,7 @@ from subprocess import CalledProcessError, run from sys import argv, stderr from python.runfiles import Runfiles + from bazel.labgrid.executor.manager import Manager @@ -99,6 +100,7 @@ def main(exe: Path, *args: str) -> int: return 0 + def resolve_runfile(value): r = Runfiles.Create() location = r.Rlocation(value) @@ -106,6 +108,7 @@ def resolve_runfile(value): return location return value + def entry(): exit(main(Path(argv[0]), *argv[1:])) diff --git a/labgrid/manager/passthrough.py b/labgrid/manager/passthrough.py index 4f0fe402b935bc13fdd160952a3bcfa83c599bc7..cf7bb4c8ed9b9ad746f3f79fb48fa0a14491eb68 100644 --- a/labgrid/manager/passthrough.py +++ b/labgrid/manager/passthrough.py @@ -3,7 +3,6 @@ from __future__ import annotations from contextlib import contextmanager from typing import Iterator - from bazel.labgrid.executor.manager import Data @@ -12,4 +11,4 @@ def manager() -> Iterator[Data]: """ A passthrough LabGrid context manager """ - yield Data(env = {}) + yield Data(env={}) diff --git a/qemu/seed/image/main.py b/qemu/seed/image/main.py index 9ea9fe0d9e566b255f04d4bf9e706bb5ff25fa46..472a70fc262b04608115cfd5da3ccca518324596 100755 --- a/qemu/seed/image/main.py +++ b/qemu/seed/image/main.py @@ -1,7 +1,8 @@ -import paramiko +import io from argparse import ArgumentParser, ArgumentTypeError + +import paramiko import pycdlib -import io def arguments(prsr: ArgumentParser) -> None: