summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/check-qemu-install41
1 files changed, 24 insertions, 17 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index 0c443f18..94300d34 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -288,23 +288,30 @@ try:
#################################################
log.info("Executing test-suite ")
- def cr(child, command):
- child.sendline(command)
- i = child.expect(['\n +Invalid command:',
- '\n +Set failed',
- 'No such file or directory',
- r'\n\S+@\S+[$#]'], timeout=1800)
-
- if i==0:
- raise Exception('Invalid command detected')
- elif i==1:
- raise Exception('Set syntax failed :/')
- elif i==2:
- log.error("Did not find VyOS smoketest, this should be an exception")
- raise Exception("WTF? did not find VyOS smoketest, this should be an exception")
- cr(c, '/usr/bin/vyos-smoketest')
-
- log.info("Smoke test status")
+ 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=1800)
+
+ if i==0:
+ raise Exception('Invalid command detected')
+ elif i==1:
+ raise Exception('Set syntax failed :/')
+ elif i==2:
+ log.error("Did not find VyOS smoketest, this should be an exception")
+ raise Exception("WTF? did not find VyOS smoketest, this should be an exception")
+
+ c.sendline('echo EXITCODE:$\x16?')
+ i = c.expect(['EXITCODE:0', 'EXITCODE:\d+'], timeout=10)
+ if i==0:
+ log.info('Smoketest finished successfully!')
+ pass
+ if i==1:
+ log.error('Smoketest failed :/')
+ raise Exception("Smoketest-failed, please look into debug output")
+
+ #log.info("Smoke test status")
#data = c.before.decode()
#################################################