Skip to content

Commit 35bfaa5

Browse files
authored
Merge pull request #1251 from sarthurdev/T9124
T9124: Fix smoketest file check
2 parents 07f6e41 + b8b965b commit 35bfaa5

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

scripts/check-qemu-install

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,18 +1367,17 @@ try:
13671367
log.info('Smoketests will be run using vyconfd/vyos-commitd')
13681368

13691369
log.info('Executing VyOS smoketests')
1370+
c.sendline('ls /usr/bin/vyos-smoketest 2>/dev/null')
1371+
c.expect('/usr/bin/vyos-smoketest')
1372+
c.expect(op_mode_prompt)
13701373
c.sendline('/usr/bin/vyos-smoketest')
13711374
i = c.expect(['\n +Invalid command:', '\n +Set failed',
1372-
'No such file or directory', r'\n\S+@\S+[$#]'], timeout=test_timeout)
1375+
r'\n\S+@\S+[$#]'], timeout=test_timeout)
13731376

13741377
if i == 0:
13751378
raise Exception('Invalid command detected')
13761379
if i == 1:
13771380
raise Exception('Set syntax failed :/')
1378-
if i == 2:
1379-
tmp = '(W)hy (T)he (F)ace? VyOS smoketest not found!'
1380-
log.error(tmp)
1381-
raise Exception(tmp)
13821381

13831382
c.sendline('echo EXITCODE:$\x16?')
13841383
i = c.expect(['EXITCODE:0', 'EXITCODE:\d+'])

0 commit comments

Comments
 (0)