From 3b22a2d4f52f24e0984bb4d712a4cafd83d06d7b Mon Sep 17 00:00:00 2001 From: jf9860 Date: Wed, 1 Mar 2017 19:43:28 -0500 Subject: Remove fragile process test from vFW validation. Process name is vairable. Process validation is implied by susbequent log validation. Allow for A&AI teardown delete to fail due to lingering references. Change-Id: Iea269d24232d4ff711233f5c666da677354ab694 Signed-off-by: jf9860 --- robot/resources/ssh/files.robot | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'robot/resources/ssh/files.robot') diff --git a/robot/resources/ssh/files.robot b/robot/resources/ssh/files.robot index 798ce89e..fcfffbb3 100644 --- a/robot/resources/ssh/files.robot +++ b/robot/resources/ssh/files.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation Some handy Keywords for accessing log files over SSH. Assumptions are that logs will belong to users other than the currently logged in user and that sudo will be required Library OperatingSystem -Library SSHLibrary +Library SSHLibrary Library HttpLibrary.HTTP Library String Library Collections @@ -11,27 +11,27 @@ Library Collections *** Keywords *** Open Connection And Log In [Documentation] Open a connection using the passed user and SSH key. Connection alias will be the host name by default. - [Arguments] ${HOST} ${user} ${pvt} ${password}= ${alias}=${HOST} ${timeout}=20s + [Arguments] ${HOST} ${user} ${pvt} ${password}= ${alias}=${HOST} ${timeout}=120s Open Connection ${HOST} alias=${alias} timeout=${timeout} Login With Public Key ${user} ${pvt} password=${password} delay=0.5 seconds Grep Local File - [Documentation] Grep the passed file name and return all of the lines that match the passed pattern using the current connection + [Documentation] Grep the passed file name and return all of the lines that match the passed pattern using the current connection [Arguments] ${pattern} ${fullpath} - ${output}= Execute Command grep ${pattern} ${fullpath} + ${output}= Execute Command grep ${pattern} ${fullpath} [Return] ${output} - + Grep File on Host - [Documentation] Grep the passed file name and return all of the lines that match the passed pattern using passed connection alias/host + [Documentation] Grep the passed file name and return all of the lines that match the passed pattern using passed connection alias/host [Arguments] ${host} ${pattern} ${fullpath} Switch Connection ${host} ${output}= Grep Local File ${pattern} ${fullpath} - @{lines}= Split To Lines ${output} + @{lines}= Split To Lines ${output} [Return] @{lines} Grep File on Hosts - [Documentation] Grep the passed file name and return all of the lines that match the passed pattern using passed list of connections - [Arguments] ${HOSTS} ${pattern} ${fullpath} + [Documentation] Grep the passed file name and return all of the lines that match the passed pattern using passed list of connections + [Arguments] ${HOSTS} ${pattern} ${fullpath} &{map}= Create Dictionary :FOR ${HOST} IN @{HOSTS} \ Log ${HOST} @@ -40,11 +40,11 @@ Grep File on Hosts [Return] &{map} Tail File on Host Until - [Documentation] Tail log file into grep which returns file lines containing the grep pattern. Will timeout after timeout= if expected pattern not received. + [Documentation] Tail log file into grep which returns file lines containing the grep pattern. Will timeout after timeout= if expected pattern not received. [Arguments] ${host} ${pattern} ${fullpath} ${expected} ${timeout}=60 ${options}=-c -0 Switch Connection ${host} - ${tailcommand}= Catenate tail ${options} -f ${fullpath} | grep --color=never ${pattern} + ${tailcommand}= Catenate tail ${options} -f ${fullpath} | grep --color=never ${pattern} Write ${tailcommand} - ${stdout}= Read Until Regexp ${expected} + ${stdout}= Read Until Regexp ${expected} @{lines}= Split To Lines ${stdout} [Return] @{lines} -- cgit 1.2.3-korg