scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-02 19:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

lf_check.py : use shlex to split command yet preserve --raw_line parameters

Browse Source 
Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-06-20 16:07:15 -06:00
parent 1daf71ede4
commit 10723d6d8b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
py-scripts/tools/lf_check.py
View File

@@ -56,6 +56,7 @@ import subprocess
import csv import csv
import shutil import shutil
from os import path from os import path
import shlex
# lf_report is from the parent of the current file # lf_report is from the parent of the current file
dir_path = os.path.dirname(os.path.realpath(__file__)) dir_path = os.path.dirname(os.path.realpath(__file__))
@@ -595,12 +596,14 @@ NOTE: for now to see stdout and stderr remove /home/lanforge from path.
stderr_log = open(stderr_log_txt, 'a') stderr_log = open(stderr_log_txt, 'a')
# HERE is thwere the test is run # HERE is thwere the test is run
print("running {}".format(command)) # print("running {}".format(command))
# need to take into account --raw_line parameters
command = shlex.split(command)
print("running {command}".format(command=command))
try: try:
process = subprocess.Popen((command).split(' '), shell=False, stdout=stdout_log, stderr=stderr_log, universal_newlines=True) process = subprocess.Popen(command, shell=False, stdout=stdout_log, stderr=stderr_log, universal_newlines=True)
# if there is a better solution please propose, the TIMEOUT Result is different then FAIL # if there is a better solution please propose, the TIMEOUT Result is different then FAIL
try: try:
#out, err = process.communicate()
process.wait(timeout=int(self.test_timeout)) process.wait(timeout=int(self.test_timeout))
except subprocess.TimeoutExpired: except subprocess.TimeoutExpired:
process.terminate() process.terminate()