From 41e462fade4e96d033519059d4aee5c8598d25f0 Mon Sep 17 00:00:00 2001 From: Jozef Behran Date: Mon, 4 Apr 2016 15:04:16 +0200 Subject: [PATCH 1/1] Fix scaling tests failing due to a name clash The tests get wrong timeout due to a clash with NetconfKeywords which uses the same name for a variable with testtool device boot timeout. Rename that NetconfKeywords variable to better indicate its purpose (and thus to avoid the name clash). Change-Id: I255308d5b2b754f632985166de7b25a8dd43b194 Signed-off-by: Jozef Behran --- csit/libraries/NetconfKeywords.robot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csit/libraries/NetconfKeywords.robot b/csit/libraries/NetconfKeywords.robot index f6610e8060..ac76e9e6ac 100644 --- a/csit/libraries/NetconfKeywords.robot +++ b/csit/libraries/NetconfKeywords.robot @@ -26,7 +26,7 @@ ${DIRECTORY_WITH_DEVICE_TEMPLATES} ${CURDIR}/../variables/netconf/device ${FIRST_TESTTOOL_PORT} 17830 ${BASE_NETCONF_DEVICE_PORT} 17830 ${DEVICE_NAME_BASE} netconf-scaling-device -${TESTTOOL_DEVICE_TIMEOUT} 60s +${TESTTOOL_BOOT_TIMEOUT} 60s ${ENABLE_NETCONF_TEST_TIMEOUT} ${ENABLE_GLOBAL_TEST_DEADLINES} *** Keywords *** @@ -140,7 +140,7 @@ NetconfKeywords__Check_Device_Is_Up NetconfKeywords__Wait_Device_Is_Up_And_Running [Arguments] ${device_name} ${number}= BuiltIn.Evaluate '${device_name}'.split('-').pop() - BuiltIn.Wait_Until_Keyword_Succeeds ${TESTTOOL_DEVICE_TIMEOUT} 1s Check_Device_Up_And_Running ${number} + BuiltIn.Wait_Until_Keyword_Succeeds ${TESTTOOL_BOOT_TIMEOUT} 1s Check_Device_Up_And_Running ${number} Install_And_Start_Testtool [Arguments] ${device-count}=10 ${debug}=true ${schemas}=none ${tool_options}=${EMPTY} ${java_options}=${TESTTOOL_DEFAULT_JAVA_OPTIONS} ${mdsal}=true -- 2.36.6