From 5a80a8cb1f3243e160667c9e1df28fadc15026d7 Mon Sep 17 00:00:00 2001 From: Rohit Gupta <rohit.gupta@eurecom.fr> Date: Mon, 28 Dec 2015 16:34:49 +0100 Subject: [PATCH] bugfixes to autotest framework --- cmake_targets/autotests/core.py | 5 +++-- cmake_targets/autotests/openair.py | 4 ++-- cmake_targets/autotests/tools/configure_cots_bandrich_ue.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake_targets/autotests/core.py b/cmake_targets/autotests/core.py index 8881781144..ee53438207 100644 --- a/cmake_targets/autotests/core.py +++ b/cmake_targets/autotests/core.py @@ -240,8 +240,9 @@ class core: # print rsp if (rsp.find(expect) == -1): return 'OK' - - raise log.err(self.failed(command, expect,debug)) + else: + print "command = " + cmd + "expect = " + expect + "rsp = " + rsp + raise log.err(self.failed(command, expect,debug)) # **************************send_wait************************* diff --git a/cmake_targets/autotests/openair.py b/cmake_targets/autotests/openair.py index e8d07ba1e1..8427735c61 100644 --- a/cmake_targets/autotests/openair.py +++ b/cmake_targets/autotests/openair.py @@ -111,8 +111,8 @@ class openair(core): error = error + ' In function: ' + sys._getframe().f_code.co_name + ': *** Caught exception: ' + str(e.__class__) + " : " + str( e) error = error + traceback.format_exc() print error - print "Retrying again in 60 seconds" - time.sleep(60) + print "Retrying again in 1 seconds" + time.sleep(1) #sys.exit(1) def connect2(self, username, password, prompt='$'): diff --git a/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py b/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py index ae25013f52..aa041360b7 100755 --- a/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py +++ b/cmake_targets/autotests/tools/configure_cots_bandrich_ue.py @@ -127,7 +127,7 @@ def start_ue () : ip = IPRoute() idx = ip.link_lookup(ifname=iface)[0] os.system ('route add 192.172.0.1 ppp0') - os.system ('ping -c 5 192.172.0.1') + os.system ('ping 192.172.0.1') break except Exception, e: error = ' Interface ' + iface + 'does not exist...' -- 2.26.2