vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Testsuite: T861: cleanup imports and use "kernel_flavor" from vyos_defaults

Browse Source
This commit is contained in:
Christian Breunig 2024-09-06 20:26:47 +02:00
parent e5627bf050
commit aa6ca5c65b
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/check-qemu-install
View File

@ -45,10 +45,7 @@ import re
import tomli import tomli
from io import BytesIO from io import BytesIO
from io import StringIO
from datetime import datetime from datetime import datetime
from pathlib import Path
from tomllib import loads as toml_loads
EXCEPTION = 0 EXCEPTION = 0
now = datetime.now() now = datetime.now()
@ -80,7 +77,6 @@ parser.add_argument('--tpmtest', help='Execute TPM encrypted config tests',
parser.add_argument('--qemu-cmd', help='Only generate QEMU launch command', parser.add_argument('--qemu-cmd', help='Only generate QEMU launch command',
action='store_true', default=False) action='store_true', default=False)
args = parser.parse_args() args = parser.parse_args()
with open('data/defaults.toml', 'rb') as f: with open('data/defaults.toml', 'rb') as f:
@ -98,14 +94,11 @@ class StreamToLogger(object):
def write(self, buf): def write(self, buf):
self.linebuf += buf self.linebuf += buf
#print('.')
while b'\n' in self.linebuf: while b'\n' in self.linebuf:
f = self.linebuf.split(b'\n', 1) f = self.linebuf.split(b'\n', 1)
if len(f) == 2: if len(f) == 2:
self.logger.debug(self.ansi_escape.sub('', f[0].decode(errors="replace").rstrip())) self.logger.debug(self.ansi_escape.sub('', f[0].decode(errors="replace").rstrip()))
self.linebuf = f[1] self.linebuf = f[1]
#print(f)
def flush(self): def flush(self):
pass pass
@ -404,7 +397,6 @@ try:
# Basic Configmode/Opmode switch # Basic Configmode/Opmode switch
################################################# #################################################
log.info('Basic CLI configuration mode test') log.info('Basic CLI configuration mode test')
kernel_flavor = toml_loads(Path('data/defaults.toml').read_text()).get('kernel_flavor')
c.sendline('configure') c.sendline('configure')
c.expect(cfg_mode_prompt) c.expect(cfg_mode_prompt)
@ -413,7 +405,7 @@ try:
c.sendline('show version') c.sendline('show version')
c.expect(op_mode_prompt) c.expect(op_mode_prompt)
c.sendline('show version kernel') c.sendline('show version kernel')
c.expect(f'{vyos_defaults["kernel_version"]}-{kernel_flavor}') c.expect(f'{vyos_defaults["kernel_version"]}-{vyos_defaults["kernel_flavor"]}')
c.expect(op_mode_prompt) c.expect(op_mode_prompt)
c.sendline('show version frr') c.sendline('show version frr')
c.expect(op_mode_prompt) c.expect(op_mode_prompt)