commit a1dfaf51e2400f4698bbd076c56473b0ba6303bf · pyrox.dev/nixpkgs

+3 -2

nixos/doc/manual/development/writing-nixos-tests.section.md

···

       121
       121
        
       ```py

     

       122
       122
        
       machine.start()

     

       123
       123
        
       machine.wait_for_unit("default.target")

     

       124
       124
       -
       if not "Linux" in machine.succeed("uname"):

     

       125
       125
       -
         raise Exception("Wrong OS")

     

       124
       124
       +
       t.assertIn("Linux", machine.succeed("uname"), "Wrong OS")

     

       126
       125
        
       ```

     

       127
       126
        
       

     

       128
       127
        
       The first line is technically unnecessary; machines are implicitly started

     
···

       133
       132
        
       ```py

     

       134
       133
        
       start_all()

     

       135
       134
        
       ```

     

       135
       135
       +
       

     

       136
       136
       +
       Under the variable `t`, all assertions from [`unittest.TestCase`](https://docs.python.org/3/library/unittest.html) are available.

     

       136
       137
        
       

     

       137
       138
        
       If the hostname of a node contains characters that can't be used in a

     

       138
       139
        
       Python variable name, those characters will be replaced with

+37 -1

nixos/lib/test-driver/src/test_driver/driver.py

···

       1
       1
        
       import os

     

       2
       2
        
       import re

     

       3
       3
        
       import signal

     

       4
       4
       +
       import sys

     

       4
       5
        
       import tempfile

     

       5
       6
        
       import threading

     

       7
       7
       +
       import traceback

     

       6
       8
        
       from collections.abc import Callable, Iterator

     

       7
       9
        
       from contextlib import AbstractContextManager, contextmanager

     

       8
       10
        
       from pathlib import Path

     

       9
       11
        
       from typing import Any

     

       12
       12
       +
       from unittest import TestCase

     

       10
       13
        
       

     

       11
       14
        
       from test_driver.logger import AbstractLogger

     

       12
       15
        
       from test_driver.machine import Machine, NixStartScript, retry

     
···

       36
       39
        
       

     

       37
       40
        
       def pythonize_name(name: str) -> str:

     

       38
       41
        
           return re.sub(r"^[^A-z_]|[^A-z0-9_]", "_", name)

     

       42
       42
       +
       

     

       43
       43
       +
       

     

       44
       44
       +
       class NixOSAssertionError(AssertionError):

     

       45
       45
       +
           pass

     

       46
       46
       +
       

     

       47
       47
       +
       

     

       48
       48
       +
       class Tester(TestCase):

     

       49
       49
       +
           failureException = NixOSAssertionError

     

       39
       50
        
       

     

       40
       51
        
       

     

       41
       52
        
       class Driver:

     
···

       140
       151
        
                   serial_stdout_on=self.serial_stdout_on,

     

       141
       152
        
                   polling_condition=self.polling_condition,

     

       142
       153
        
                   Machine=Machine,  # for typing

     

       154
       154
       +
                   t=Tester(),

     

       143
       155
        
               )

     

       144
       156
        
               machine_symbols = {pythonize_name(m.name): m for m in self.machines}

     

       145
       157
        
               # If there's exactly one machine, make it available under the name

     
···

       163
       175
        
               """Run the test script"""

     

       164
       176
        
               with self.logger.nested("run the VM test script"):

     

       165
       177
        
                   symbols = self.test_symbols()  # call eagerly

     

       166
       166
       -
                   exec(self.tests, symbols, None)

     

       178
       178
       +
                   try:

     

       179
       179
       +
                       exec(self.tests, symbols, None)

     

       180
       180
       +
                   except NixOSAssertionError:

     

       181
       181
       +
                       exc_type, exc, tb = sys.exc_info()

     

       182
       182
       +
                       filtered = [

     

       183
       183
       +
                           frame

     

       184
       184
       +
                           for frame in traceback.extract_tb(tb)

     

       185
       185
       +
                           if frame.filename == "<string>"

     

       186
       186
       +
                       ]

     

       187
       187
       +
       

     

       188
       188
       +
                       self.logger.log_test_error("Traceback (most recent call last):")

     

       189
       189
       +
                       code = self.tests.splitlines()

     

       190
       190
       +
                       for frame, line in zip(filtered, traceback.format_list(filtered)):

     

       191
       191
       +
                           self.logger.log_test_error(line.rstrip())

     

       192
       192
       +
                           if lineno := frame.lineno:

     

       193
       193
       +
                               self.logger.log_test_error(

     

       194
       194
       +
                                   f"    {code[lineno - 1].strip()}",

     

       195
       195
       +
                               )

     

       196
       196
       +
       

     

       197
       197
       +
                       self.logger.log_test_error("") # blank line for readability

     

       198
       198
       +
                       exc_prefix = exc_type.__name__ if exc_type is not None else "Error"

     

       199
       199
       +
                       for line in f"{exc_prefix}: {exc}".splitlines():

     

       200
       200
       +
                           self.logger.log_test_error(line)

     

       201
       201
       +
       

     

       202
       202
       +
                       sys.exit(1)

     

       167
       203
        
       

     

       168
       204
        
           def run_tests(self) -> None:

     

       169
       205
        
               """Run the test script (for non-interactive test runs)"""

+19

nixos/lib/test-driver/src/test_driver/logger.py

···

       45
       45
        
               pass

     

       46
       46
        
       

     

       47
       47
        
           @abstractmethod

     

       48
       48
       +
           def log_test_error(self, *args, **kwargs) -> None:  # type:ignore

     

       49
       49
       +
               pass

     

       50
       50
       +
       

     

       51
       51
       +
           @abstractmethod

     

       48
       52
        
           def log_serial(self, message: str, machine: str) -> None:

     

       49
       53
        
               pass

     

       50
       54
        
       

     
···

       97
       101
        
               self.tests[self.currentSubtest].stderr += args[0] + os.linesep

     

       98
       102
        
               self.tests[self.currentSubtest].failure = True

     

       99
       103
        
       

     

       104
       104
       +
           def log_test_error(self, *args, **kwargs) -> None:  # type: ignore

     

       105
       105
       +
               self.error(*args, **kwargs)

     

       106
       106
       +
       

     

       100
       107
        
           def log_serial(self, message: str, machine: str) -> None:

     

       101
       108
        
               if not self._print_serial_logs:

     

       102
       109
        
                   return

     
···

       156
       163
        
               for logger in self.logger_list:

     

       157
       164
        
                   logger.warning(*args, **kwargs)

     

       158
       165
        
       

     

       166
       166
       +
           def log_test_error(self, *args, **kwargs) -> None:  # type: ignore

     

       167
       167
       +
               for logger in self.logger_list:

     

       168
       168
       +
                   logger.log_test_error(*args, **kwargs)

     

       169
       169
       +
       

     

       159
       170
        
           def error(self, *args, **kwargs) -> None:  # type: ignore

     

       160
       171
        
               for logger in self.logger_list:

     

       161
       172
        
                   logger.error(*args, **kwargs)

     
···

       222
       233
        
       

     

       223
       234
        
               self._eprint(Style.DIM + f"{machine} # {message}" + Style.RESET_ALL)

     

       224
       235
        
       

     

       236
       236
       +
           def log_test_error(self, *args, **kwargs) -> None:  # type: ignore

     

       237
       237
       +
               prefix = Fore.RED + "!!! " + Style.RESET_ALL

     

       238
       238
       +
               # NOTE: using `warning` instead of `error` to ensure it does not exit after printing the first log

     

       239
       239
       +
               self.warning(f"{prefix}{args[0]}", *args[1:], **kwargs)

     

       240
       240
       +
       

     

       225
       241
        
       

     

       226
       242
        
       class XMLLogger(AbstractLogger):

     

       227
       243
        
           def __init__(self, outfile: str) -> None:

     
···

       259
       275
        
               self.log(*args, **kwargs)

     

       260
       276
        
       

     

       261
       277
        
           def error(self, *args, **kwargs) -> None:  # type: ignore

     

       278
       278
       +
               self.log(*args, **kwargs)

     

       279
       279
       +
       

     

       280
       280
       +
           def log_test_error(self, *args, **kwargs) -> None:  # type: ignore

     

       262
       281
        
               self.log(*args, **kwargs)

     

       263
       282
        
       

     

       264
       283
        
           def log(self, message: str, attributes: dict[str, str] = {}) -> None:

nixos/lib/test-script-prepend.py

···

       8
       8
        
       from typing import Callable, Iterator, ContextManager, Optional, List, Dict, Any, Union

     

       9
       9
        
       from typing_extensions import Protocol

     

       10
       10
        
       from pathlib import Path

     

       11
       11
       +
       from unittest import TestCase

     

       11
       12
        
       

     

       12
       13
        
       

     

       13
       14
        
       class RetryProtocol(Protocol):

     
···

       51
       52
        
       serial_stdout_off: Callable[[], None]

     

       52
       53
        
       serial_stdout_on: Callable[[], None]

     

       53
       54
        
       polling_condition: PollingConditionProtocol

     

       55
       55
       +
       t: TestCase