summaryrefslogtreecommitdiffstats
path: root/nixos/lib/test-driver
diff options
context:
space:
mode:
authorJamie McClymont <jamie@kwiius.com>2020-08-27 23:29:37 +1200
committerJamie McClymont <jamie@kwiius.com>2020-08-27 23:29:55 +1200
commitd7875caf76fb2196096ccbec0da48f55f8d7b734 (patch)
tree4f428d4f16c3dc17e9db3694943ef021af033875 /nixos/lib/test-driver
parent6bdf265bb6fa4d77200485c501af3c261af8230d (diff)
nixos/test: colour machine names
Diffstat (limited to 'nixos/lib/test-driver')
-rw-r--r--nixos/lib/test-driver/test-driver.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 99c6eb06de3c..dc11eaa1982f 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -3,6 +3,7 @@ import argparse
import atexit
import base64
import io
+import itertools
import logging
import os
import pathlib
@@ -92,10 +93,17 @@ logging.basicConfig(format="%(message)s")
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:
@@ -172,7 +180,10 @@ class Machine:
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: