Skip to content

Commit

Permalink
Merge pull request NixOS#96152 from JJJollyjim/colour-test-machines-s…
Browse files Browse the repository at this point in the history
…taging

nixos/test: colour machine names
  • Loading branch information
Mic92 committed Aug 27, 2020
2 parents 2995fa4 + d7875ca commit 1bff6fe
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions nixos/lib/test-driver/test-driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import atexit
import base64
import io
import itertools
import logging
import os
import pathlib
Expand Down Expand Up @@ -92,10 +93,17 @@
logger = logging.getLogger("test-driver")
logger.setLevel(logging.INFO)

machine_colours_iter = (
"\x1b[{}m".format(x) for x in itertools.cycle(reversed(range(31, 37)))
)


class MachineLogAdapter(logging.LoggerAdapter):
def process(self, msg: str, kwargs: Any) -> Tuple[str, Any]:
return f"{self.extra['machine']}: {msg}", kwargs
return (
f"{self.extra['colour_code']}{self.extra['machine']}\x1b[39m: {msg}",
kwargs,
)


def make_command(args: list) -> str:
Expand Down Expand Up @@ -172,7 +180,10 @@ def create_dir(name: str) -> str:
self.socket = None
self.monitor: Optional[socket.socket] = None
self.allow_reboot = args.get("allowReboot", False)
self.logger = MachineLogAdapter(logger, extra=dict(machine=self.name))
self.logger = MachineLogAdapter(
logger,
extra=dict(machine=self.name, colour_code=next(machine_colours_iter)),
)

@staticmethod
def create_startcommand(args: Dict[str, str]) -> str:
Expand Down

0 comments on commit 1bff6fe

Please sign in to comment.