commit 6a13f6969b007667dfa666057dd66b6d5105f568
author Daniele Moro <daniele@opennetworking.org> Mon Nov 18 15:49:16 2019 -0800
committer Zack Williams <zdw@opennetworking.org> Mon Jan 13 23:55:48 2020 +0000
tree db75dac6516460d1af1548ef60f43bddac01eda2
parent bee8f42bc2717aa1e2592230cd0264d3206f00d0

Tests now support the new Karaf shell in ONOS 2.2

Change-Id: I072047a42b60d72925ce08b7360ad610a2b97494

tests/atests/common/testCaseUtils.py

diff --git a/tests/atests/common/testCaseUtils.py b/tests/atests/common/testCaseUtils.py
index 529d540..124b4e0 100755
--- a/tests/atests/common/testCaseUtils.py
+++ b/tests/atests/common/testCaseUtils.py
@@ -82,9 +82,9 @@
     child = pexpect.spawn('ssh -p 30115 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no karaf@%s' % host)
     child.expect('[pP]assword:')
     child.sendline('karaf')
-    child.expect('(\\x1b\[\d*;?\d+m){1,2}onos> (\\x1b\[\d*;?\d+m){1,2}')
+    child.expect('(\\x1b\[\d*;?\d+m){1,2}(onos>|karaf@root >) (\\x1b\[\d*;?\d+m){1,2}')
     child.sendline(cmd)
-    child.expect('(\\x1b\[\d*;?\d+m){1,2}onos> (\\x1b\[\d*;?\d+m){1,2}')
+    child.expect('(\\x1b\[\d*;?\d+m){1,2}(onos>|karaf@root >) (\\x1b\[\d*;?\d+m){1,2}')
 
     output.write(child.before)