diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-11-08 10:26:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 10:26:20 +0000 |
| commit | 438a0cd40b2e40c0b85f6ea2eafaca094bd16bae (patch) | |
| tree | 6d8cd3cc0072d0eaba2a849f4126114d66f5a84a | |
| parent | b937c4c734afffe5cf7bf83d1f85e861b7a8c68c (diff) | |
| parent | 5854aaf680e3c04629a62f36a2ea27dccd82fcae (diff) | |
| download | nixpkgs-438a0cd40b2e40c0b85f6ea2eafaca094bd16bae.tar nixpkgs-438a0cd40b2e40c0b85f6ea2eafaca094bd16bae.tar.gz nixpkgs-438a0cd40b2e40c0b85f6ea2eafaca094bd16bae.tar.bz2 nixpkgs-438a0cd40b2e40c0b85f6ea2eafaca094bd16bae.tar.lz nixpkgs-438a0cd40b2e40c0b85f6ea2eafaca094bd16bae.tar.xz nixpkgs-438a0cd40b2e40c0b85f6ea2eafaca094bd16bae.tar.zst nixpkgs-438a0cd40b2e40c0b85f6ea2eafaca094bd16bae.zip | |
Merge pull request #73032 from marijanp/improvement-test-driver-py
nixos/tests: improve get_unit_info expressiveness on failure
| -rw-r--r-- | nixos/lib/test-driver/test-driver.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 93b8eebd2e1..978441dbce8 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -319,7 +319,11 @@ class Machine: def get_unit_info(self, unit, user=None): status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user) if status != 0: - return None + raise Exception( + 'retrieving systemctl info for unit "{}" {} failed with exit code {}'.format( + unit, "" if user is None else 'under user "{}"'.format(user), status + ) + ) line_pattern = re.compile(r"^([^=]+)=(.*)$") |