From 84f9d0fa5cd461100e275262a0925aec77ae6cff Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Wed, 12 Aug 2015 15:33:51 -0700 Subject: [PATCH] default user for verifying karaf log file should be ${CONTROLLER_USER} hopefully we will end up using more descriptive variables like ODLVM1_USER, but for now CONTROLLER_USER is avaiable. This patch fixes a bug, where the default user for "Run Command On Remote System" has it's default user as ${MININET_USER}. If the given environment has different users for the mininet and controller VM, this keyword "Check Karaf Log File Does Not Have Messages" ended up using ${MININET_USER} which is obviously wrong since the karaf.log file is always going to be on the controller. small bug, but hit me locally. Change-Id: Id9ef26a1ac691a814e6165bd55cbf69edc3e325f Signed-off-by: Jamo Luhrsen --- test/csit/libraries/KarafKeywords.robot | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/csit/libraries/KarafKeywords.robot b/test/csit/libraries/KarafKeywords.robot index 0be4ca024a..eaa82c36bb 100644 --- a/test/csit/libraries/KarafKeywords.robot +++ b/test/csit/libraries/KarafKeywords.robot @@ -9,8 +9,10 @@ ${BUNDLEFOLDER} distribution-karaf-0.3.0-SNAPSHOT *** Keywords *** Check Karaf Log File Does Not Have Messages - [Arguments] ${ip} ${message} ${log_file}=${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log - ${output}= Run Command On Remote System ${ip} grep ${message} ${log_file} + [Arguments] ${ip} ${message} ${user}=${CONTROLLER_USER} ${log_file}=${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log + [Documentation] Fails if the provided ${message} is found in the karaf.log file. Uses grep to search. The + ... karaf.log file can be overridden with ${log_file} to be any file on the given system @ ${ip} + ${output}= Run Command On Remote System ${ip} grep ${message} ${log_file} ${user} Should Not Contain ${output} ${message} Verify Feature Is Installed -- 2.36.6