public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #96152 from JJJollyjim/colour-test-machines-staging"

Browse Source 
This reverts commit 1bff6fe17c, reversing
changes made to 2995fa48cb.

There’s presumably nothing wrong with this PR, except that it
conflicts with reverting #96254 which broke several tests (#96699).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2020-08-30 15:41:41 -07:00
parent b317137894
commit a0a421bf5e
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/lib/test-driver/test-driver.py
View File

@ -3,7 +3,6 @@ import argparse
import atexit import atexit
import base64 import base64
import io import io
import itertools
import logging import logging
import os import os
import pathlib import pathlib
@ -93,17 +92,10 @@ logging.basicConfig(format="%(message)s")
logger = logging.getLogger("test-driver") logger = logging.getLogger("test-driver")
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)
machine_colours_iter = (
"\x1b[{}m".format(x) for x in itertools.cycle(reversed(range(31, 37)))
)
class MachineLogAdapter(logging.LoggerAdapter): class MachineLogAdapter(logging.LoggerAdapter):
def process(self, msg: str, kwargs: Any) -> Tuple[str, Any]: def process(self, msg: str, kwargs: Any) -> Tuple[str, Any]:
return ( return f"{self.extra['machine']}: {msg}", kwargs
f"{self.extra['colour_code']}{self.extra['machine']}\x1b[39m: {msg}",
kwargs,
)
def make_command(args: list) -> str: def make_command(args: list) -> str:
@ -180,10 +172,7 @@ class Machine:
self.socket = None self.socket = None
self.monitor: Optional[socket.socket] = None self.monitor: Optional[socket.socket] = None
self.allow_reboot = args.get("allowReboot", False) self.allow_reboot = args.get("allowReboot", False)
self.logger = MachineLogAdapter( self.logger = MachineLogAdapter(logger, extra=dict(machine=self.name))
logger,
extra=dict(machine=self.name, colour_code=next(machine_colours_iter)),
)
@staticmethod @staticmethod
def create_startcommand(args: Dict[str, str]) -> str: def create_startcommand(args: Dict[str, str]) -> str: