From f1a862051564f745612a6b64434fb8b01c32177f Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Mon, 10 Feb 2020 13:29:32 +0100
Subject: [PATCH] CI: fixes in python framework -- fromdos was to be called
from python executor and not from ADB server -- doing a power-cycle on CAT-M
module at start of test
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/main.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index d3027630b95..e1223392693 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -248,6 +248,7 @@ class SSHConnection():
elif self.sshresponse == 1:
logging.debug('\u001B[1;37;41m Unexpected EOF \u001B[0m')
logging.debug('Expected Line : ' + expectedline)
+ logging.debug(str(self.ssh.before))
sys.exit(self.sshresponse)
elif self.sshresponse == 2:
logging.debug('\u001B[1;37;41m Unexpected TIMEOUT \u001B[0m')
@@ -1213,6 +1214,11 @@ class SSHConnection():
# Calling twice AT to clear all buffers
self.command('AT', 'OK|ERROR', 5)
self.command('AT', 'OK', 5)
+ # Doing a power cycle
+ self.command('AT^RESET', 'SIMSTORE,READY', 15)
+ self.command('AT', 'OK|ERROR', 5)
+ self.command('AT', 'OK', 5)
+ self.command('ATE1', 'OK', 5)
# Disabling the Radio
self.command('AT+CFUN=0', 'OK', 5)
logging.debug('\u001B[1m Cellular Functionality disabled\u001B[0m')
@@ -2763,7 +2769,9 @@ class SSHConnection():
self.copyin(self.UEIPAddress, self.UEUserName, self.UEPassword, self.UESourceCodePath + '/cmake_targets/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
else:
self.copyin(self.ADBIPAddress, self.ADBUserName, self.ADBPassword, self.EPCSourceCodePath + '/scripts/iperf_server_' + self.testCase_id + '_' + device_id + '.log', '.')
- self.command('fromdos -o iperf_server_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+ # fromdos has to be called on the python executor not on ADB server
+ cmd = 'fromdos -o iperf_server_' + self.testCase_id + '_' + device_id + '.log'
+ subprocess.run(cmd, shell=True)
self.Iperf_analyzeV2Server(lock, UE_IPAddress, device_id, statusQueue, modified_options)
# in case of OAI UE:
--
GitLab