diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-10-07 22:02:58 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-10-07 22:02:58 +0200 |
| commit | be1d5e016590e9373dd7f5caf8602125ceff899f (patch) | |
| tree | 9ddf92e2bf73711a2d17afb3f2f2142a80eaebb1 /scripts | |
| parent | 3adcd14cef2b412b9539e89e33034c0b8cbe4009 (diff) | |
| download | vyos-build-be1d5e016590e9373dd7f5caf8602125ceff899f.tar.gz vyos-build-be1d5e016590e9373dd7f5caf8602125ceff899f.zip | |
Testsuite: T3664: move to new toml based input files
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-qemu-install | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 61e206a4..246f90b8 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2019-2021, VyOS maintainers and contributors +# Copyright (C) 2019-2022, VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -42,7 +42,7 @@ import random import traceback import logging import re -import json +import toml from io import BytesIO from io import StringIO @@ -78,8 +78,8 @@ parser.add_argument('--qemu-cmd', help='Only generate QEMU launch command', args = parser.parse_args() -with open('data/defaults.json') as f: - vyos_defaults = json.load(f) +with open('data/defaults.toml') as f: + vyos_defaults = toml.load(f) class StreamToLogger(object): """ @@ -391,7 +391,7 @@ try: c.sendline('show version') c.expect(op_mode_prompt) c.sendline('show version kernel') - c.expect(f'{vyos_defaults["kernel_version"]}-{vyos_defaults["kernel_flavor"]}') + c.expect(f'{vyos_defaults["kernel_version"]}-{vyos_defaults["architecture"]}-vyos') c.expect(op_mode_prompt) c.sendline('show version frr') c.expect(op_mode_prompt) |