Add log_file_path arg to 'Get SOL Console Pid'
Also, pass the value on the call to 'Get SOL Console Pid' from
'Start SOL Console Logging'. This fixes a problem where
${log_file_path} is undefined.
Change-Id: I19c4c50239a44df9d6c73ecba6aad340ebb42770
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/lib/common_utils.robot b/lib/common_utils.robot
index e3eae8a..a9fa72e 100755
--- a/lib/common_utils.robot
+++ b/lib/common_utils.robot
@@ -12,6 +12,7 @@
Library gen_print.py
Library gen_robot_print.py
Library gen_cmd.py
+Library gen_robot_valid.py
Library gen_robot_keyword.py
Library bmc_ssh_utils.py
Library utils.py
@@ -305,11 +306,11 @@
Get SOL Console Pid
[Documentation] Get the pid of the active SOL console job.
- [Arguments] ${expect_running}=${0}
+ [Arguments] ${expect_running}=${0} ${log_file_path}=${EMPTY}
# Description of argument(s):
- # expect_running If set and if no SOL console job is found, print debug
- # info and fail.
+ # expect_running If set and if no SOL console job is found, print debug info and fail.
+ # log_file_path Needed to print debug info if expect_running is set and no pid is found.
# Find the pid of the active system console logging session (if any).
${search_string}= Create OS Console Command String
@@ -331,8 +332,7 @@
Cmd Fnc cat ${log_file_path} ; echo ; ${ps_cmd} quiet=${0}
... print_output=${1} show_err=${1}
-
- Should Not Be Empty ${os_con_pid}
+ Valid Value os_con_pid
Stop SOL Console Logging
@@ -418,7 +418,7 @@
Should Be Equal ${rc} ${0}
Wait Until Keyword Succeeds 10 seconds 0 seconds
- ... Get SOL Console Pid ${1}
+ ... Get SOL Console Pid ${1} ${log_file_path}
[Return] ${log_output}