Merge branch 'develop' into enhancement-10-harmony

cmake_targets/autotests/run_exec_lte-softmodem_tests.py

@@ -313,7 +313,7 @@ def SSHSessionWrapper(machine, username, key_file, password, logdir_remote, logd
 # \param CleanUpAluLteBox program to terminate AlU Bell Labs LTE Box
 # \param ExmimoRfStop String to stop EXMIMO card (specified in test_case_list.xml)
 def cleanOldPrograms(oai, programList, CleanUpAluLteBox, ExmimoRfStop, logdir, logdirOAI5GRepo):
-  cmd = 'sudo -E killall -9 -q -r ' + programList
+  cmd = 'sudo -E killall -s INT -q -r ' + programList + ' ; sleep 5 ; sudo -E killall -9 -q -r ' + programList
   result = oai.send(cmd, True)
   print "Killing old programs..." + result
   programArray = programList.split()

cmake_targets/autotests/tools/configure_cots_sony_experia_m4_ue.py

@@ -73,7 +73,7 @@ def start_ue () :
      time.sleep ( 2)
      #Now we check if ppp0 interface is up and running
      try:
-        cmd = 'sudo adb -s ' + device_id + ' shell netcfg |grep 192.'
+        cmd = 'sudo adb -s ' + device_id + ' shell netcfg |grep UP'
         status, out = commands.getstatusoutput(cmd)
         if (out == '') :
             print "Waiting for UE to connect and get IP Address..."