diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-07-24 21:17:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-24 21:17:09 +0000 |
| commit | 35bfaa5b73f142e48c1bfe6e6221e8141c836be5 (patch) | |
| tree | 42fff19e1ae25ab00ec29d3138fec9d32e4172ae /scripts | |
| parent | 07f6e41261d607deadbc003b2b929bd24802958f (diff) | |
| parent | b8b965b9e32b1f586b2c04bae204b6edc119c002 (diff) | |
| download | vyos-build-35bfaa5b73f142e48c1bfe6e6221e8141c836be5.tar.gz vyos-build-35bfaa5b73f142e48c1bfe6e6221e8141c836be5.zip | |
Merge pull request #1251 from sarthurdev/T9124
T9124: Fix smoketest file check
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-qemu-install | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 8d705674..62896266 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -1367,18 +1367,17 @@ try: log.info('Smoketests will be run using vyconfd/vyos-commitd') log.info('Executing VyOS smoketests') + c.sendline('ls /usr/bin/vyos-smoketest 2>/dev/null') + c.expect('/usr/bin/vyos-smoketest') + c.expect(op_mode_prompt) c.sendline('/usr/bin/vyos-smoketest') i = c.expect(['\n +Invalid command:', '\n +Set failed', - 'No such file or directory', r'\n\S+@\S+[$#]'], timeout=test_timeout) + r'\n\S+@\S+[$#]'], timeout=test_timeout) if i == 0: raise Exception('Invalid command detected') if i == 1: raise Exception('Set syntax failed :/') - if i == 2: - tmp = '(W)hy (T)he (F)ace? VyOS smoketest not found!' - log.error(tmp) - raise Exception(tmp) c.sendline('echo EXITCODE:$\x16?') i = c.expect(['EXITCODE:0', 'EXITCODE:\d+']) |