From 6d2ecc6ca349b2b8cdc25d24622a481cce37f0a7 Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Tue, 26 May 2020 17:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4UI=E9=80=80=E5=87=BA=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E7=94=A8=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E5=8D=B3=E4=BF=AE=E6=94=B9UiLoginAn?= =?UTF-8?q?dAaddLocalIP=E5=90=8D=E7=A7=B0=E4=B8=BAUiLoginAndAddLocalIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 02-Keyword/tsg_common/LoginAndLogoutTypeSwitch.robot | 4 ++-- 02-Keyword/tsg_ui/Login/Login.robot | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/02-Keyword/tsg_common/LoginAndLogoutTypeSwitch.robot b/02-Keyword/tsg_common/LoginAndLogoutTypeSwitch.robot index 170e720..8c22bba 100644 --- a/02-Keyword/tsg_common/LoginAndLogoutTypeSwitch.robot +++ b/02-Keyword/tsg_common/LoginAndLogoutTypeSwitch.robot @@ -16,10 +16,10 @@ LoginAndAddLocalIP Run Keyword If '${loginType}' == 'api' ApiLoginAndAddLocalIP ... ELSE IF '${loginType}' == 'cli' CliLogin - ... ELSE IF '${loginType}' != '${None}' UiLoginAndAaddLocalIP + ... ELSE IF '${loginType}' != '${None}' UiLoginAndAddLocalIP LogoutAndDelLocalIP [Tags] tsg_adc tsg_bf_api tsg_cli Run Keyword If '${loginType}' == 'api' ApiLogoutAndDelLocalIP ... ELSE IF '${loginType}' == 'cli' CliLogout - ... ELSE IF '${loginType}' != '${None}' UiLoginAndAaddLocalIP + ... ELSE IF '${loginType}' != '${None}' UiLogoutAndDelLocalIP diff --git a/02-Keyword/tsg_ui/Login/Login.robot b/02-Keyword/tsg_ui/Login/Login.robot index 6eab9ec..d1b8b87 100644 --- a/02-Keyword/tsg_ui/Login/Login.robot +++ b/02-Keyword/tsg_ui/Login/Login.robot @@ -18,8 +18,8 @@ AddLocalIp CreatePage ${obj1}[type] ${obj1}[name] ipads=${obj1}[ipads] ipclient=${obj1}[ipclient] ipclienttext1=${obj1}[ipclienttext1] ipclienttext2=${obj1}[ipclienttext2] set global variable ${LocahIPName} ${obj1}[name] -UiLoginAndAaddLocalIP - log UiLoginAndAaddLocalIP +UiLoginAndAddLocalIP + log UiLoginAndAddLocalIP Login.Login Run Keyword If ${addTestClentIPFlag}==1 AddLocalIp - log UiLoginAndAaddLocalIP:${LocahIPName} + log UiLoginAndAddLocalIP:${LocahIPName}