commit 4c39991842ce43181734508752c8c59c2414614d
author Andy Bavier <andy@opennetworking.org> Tue Jan 28 13:45:59 2020 -0700
committer Andy Bavier <andy@opennetworking.org> Tue Jan 28 13:45:59 2020 -0700
tree d4d5a5c136cdddf51e39f3ba855581b2a7a26858
parent d9af149da61bd8ae4227fa5cf1618453bd6c02e0

Port change 17065 to cord-tester repo

Change-Id: I09df00b965e40a49ea3ba1d4fbc03f99d761dbba

src/test/cord-api/Framework/utils/testCaseUtils.py

diff --git a/src/test/cord-api/Framework/utils/testCaseUtils.py b/src/test/cord-api/Framework/utils/testCaseUtils.py
index 58b1478..1d2d021 100755
--- a/src/test/cord-api/Framework/utils/testCaseUtils.py
+++ b/src/test/cord-api/Framework/utils/testCaseUtils.py
@@ -107,9 +107,12 @@
     )
     child.expect(r"[pP]assword:")
     child.sendline("karaf")
-    child.expect(r"(\x1b\[\d*;?\d+m){1,2}(onos>|karaf@root >) (\x1b\[\d*;?\d+m){1,2}")
+    # Expected prompt:
+    #  onos>          (ONOS 1.x)
+    #  karaf@root >   (ONOS 2.x)
+    child.expect([r'(\x1b\[\d*;?\d+m){1,2}onos> (\x1b\[\d*;?\d+m){1,2}', r'karaf@root >'])
     child.sendline(cmd)
-    child.expect(r"(\x1b\[\d*;?\d+m){1,2}(onos>|karaf@root >) (\x1b\[\d*;?\d+m){1,2}")
+    child.expect([r'(\x1b\[\d*;?\d+m){1,2}onos> (\x1b\[\d*;?\d+m){1,2}', r'karaf@root >'])
 
     output.write(child.before)