From 1c6f2721c5ea831aef0574a6ef3a3fba7dc15c2b Mon Sep 17 00:00:00 2001 From: byb11 Date: Thu, 11 Mar 2021 15:10:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Settings=E5=92=8CAdministrati?= =?UTF-8?q?on=E7=94=A8=E4=BE=8B=E5=8F=8A=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_ui/ui_administration/AuditLogsCase.robot | 5 +++-- .../LoginRestrictionsCase.robot | 2 +- .../tsg_ui/ui_settings/SSLFingerprintCase.robot | 7 ++++++- .../TrustedCertificateAuthoritiesCase.robot | 2 +- .../tsg_ui/administration/Administration.robot | 2 +- 02-Keyword/tsg_ui/setting/Settings.robot | 16 ++++++++-------- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot b/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot index 706fb37..4e6d75f 100644 --- a/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot @@ -118,8 +118,9 @@ AuditLogsSNATIPPools AuditLogsVPNAccounts [Tags] Positive UI VPN Accounts Administration AuditLogs - CreateVPNAccounts AuditLogsVPNAccounts 111111 name - EditVPNAccounts AuditLogsVPNAccounts 222222 name + ${a} evaluate random.randint(100000,999999) random + CreateVPNAccounts ${TEST NAME}${a} 111111 name + EditVPNAccounts ${TEST NAME}${a} 222222 name VPNAccountsDelete Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} AdminOpenPages sidebarsystem_PolicyConfigurationLog sidebarsystem_PolicyConfigurationLog diff --git a/01-TestCase/tsg_ui/ui_administration/LoginRestrictionsCase.robot b/01-TestCase/tsg_ui/ui_administration/LoginRestrictionsCase.robot index eed3fb9..3361e5f 100644 --- a/01-TestCase/tsg_ui/ui_administration/LoginRestrictionsCase.robot +++ b/01-TestCase/tsg_ui/ui_administration/LoginRestrictionsCase.robot @@ -31,7 +31,7 @@ LoginRestrictionsNotWhitelistLogin Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} Assertion /html/body/div[last()]/p Unauthorized source IP. UpdataLoginRestrictionsSQLIP ${Whitelist} - sleep ${sleep} + sleep ${sleep_Wait} click element xpath=/html/body/div/div/div[2]/div/div[4]/button sleep ${sleep} Assertion //*[@id="children0"]/div/span Dashboard diff --git a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot index ea67597..df3fb98 100644 --- a/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/SSLFingerprintCase.robot @@ -140,9 +140,14 @@ SSLFingerprintShowNotPinning Should Be Equal As Strings ${text} No Data SSLFingerprintPagingDisplay - [Tags] Positive UI Settings SSLFingerprint + [Tags] Positive UI Settings SSLFingerprint + ${a}= RandomNumber + CreateSSLFingerprint aaa${a}db3e351bbd8d38b64c41fffff Yes JA3Hash Description=test OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[5] Targeting=xpath PagingDisplay 50 + Settings-Search aaa${a}db3e351bbd8d38b64c41fffff JA3Hash + click xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr + DeleteSSLFingerprint SSLFingerprintCreateJa3NotCombined [Tags] Boundary UI JA3Hash Settings SSLFingerprint diff --git a/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot b/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot index 8f94ebe..8e18470 100644 --- a/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot +++ b/01-TestCase/tsg_ui/ui_settings/TrustedCertificateAuthoritiesCase.robot @@ -164,7 +164,7 @@ TrustedCertificateAuthoritiesCreateNameThreeCharacters OpenPages sidebarProxy_CertificateManagement //*[@id="proxyTabs"]/div/ul/li[1] xpath click id=app_create #点击Import sleep ${sleep} - input id=authoritiesAdd_name 123 #输入name + input id=authoritiesAdd_name1 123 #输入name sleep ${sleep_min} click id=authoritiesAdd_sub sleep ${sleep_min} diff --git a/02-Keyword/tsg_ui/administration/Administration.robot b/02-Keyword/tsg_ui/administration/Administration.robot index 660cbed..cc8fdde 100644 --- a/02-Keyword/tsg_ui/administration/Administration.robot +++ b/02-Keyword/tsg_ui/administration/Administration.robot @@ -502,7 +502,7 @@ LoginRestrictionsObtainSQLIP UpdataLoginRestrictionsSQLIP [Arguments] ${Whitelist} [Documentation] 恢复白名单数据库 - sleep ${sleep_min} + sleep ${sleep} Connect To Database Using Custom Params pymysql ${mysqlHost} ${return} Execute Sql String UPDATE login_restrictions_config SET login_addr_whitelist='${Whitelist}' WHERE id=1 Disconnect From Database diff --git a/02-Keyword/tsg_ui/setting/Settings.robot b/02-Keyword/tsg_ui/setting/Settings.robot index 0a4b673..580ef16 100644 --- a/02-Keyword/tsg_ui/setting/Settings.robot +++ b/02-Keyword/tsg_ui/setting/Settings.robot @@ -183,7 +183,7 @@ SNATIPRangeCreate SNATIPSearch [Arguments] ${value} ${search} - Wait Until Element Is Enabled xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div/div/input ${sleep_Wait} + sleep ${sleep} click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div/div/input #点击搜索框 sleep ${sleep_min} #判断是使用name搜索还是id搜索 @@ -264,7 +264,7 @@ EditVPNAccounts VPNAccountsSearch [Arguments] ${value} ${search} - Wait Until Element Is Enabled xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div/div/input ${sleep_Wait} + sleep ${sleep} click xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[1]/div/div[2]/div[2]/div/div/div[2]/div/div/div/input #点击搜索框 sleep ${sleep_min} click xpath=/html/body/div/div[1]/div[1]/ul/li[2] #点击name @@ -550,9 +550,9 @@ EditHijackFiles sleep ${sleep_min} click id=hijackEdit #点击Edit sleep ${sleep_min} - Clear Element Text id=hijack_profileName #清空输入框 + Clear Element Text id=hijack_profileName1 #清空输入框 sleep ${sleep_min} - input id=hijack_profileName ${name1} #输入框输入 + input id=hijack_profileName1 ${name1} #输入框输入 sleep ${sleep_min} Choose File xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[5]/div/div/div[1]/input ${file} #上传文件 sleep ${sleep_min} @@ -2431,7 +2431,7 @@ DeletePacketCapture click id=packet_del sleep ${sleep} click xpath=/html/body/div/div/div[3]/button[2] - Wait Until Element Is Enabled xpath=/html/body/div[last()]/p ${sleep_Wait} + sleep ${sleep} Policy_Verify_Switch [Arguments] ${Protocol} @@ -2460,7 +2460,7 @@ UploadFilesSize ... AND Choose File xpath=//*[@id="policy_Manipulation_create6"]/div[2]/form/div[2]/div/div/div/input ${file} #上传文件 ... AND sleep ${sleep_min} ... AND click id=responseAddOk1 - ... AND sleep ${sleep_min} + ... AND sleep ${sleep} run keyword if "${Page}"=="InsertScripts" run keywords sleep ${sleep_min} ... AND click id=children6 #点击一级目录Settings ... AND sleep ${sleep_min} @@ -2489,7 +2489,7 @@ UploadFilesSize ... AND sleep ${sleep_min} ... AND click id=hijackAdd #点击Create ... AND sleep ${sleep} - ... AND input id=hijack_profileName ${name} #输入name + ... AND input id=hijack_profileName1 ${name} #输入name ... AND sleep ${sleep} ... AND Choose File xpath=//*[@id="app"]/div/div[3]/div[2]/div/div/div[1]/div[2]/form/div[2]/div/div/div[1]/input ${file} #上传文件 ... AND sleep ${sleep_min} @@ -2511,7 +2511,7 @@ UploadFilesSize ... AND Choose File xpath=//*[@id="app"]/div/div[3]/div[2]/div/div[3]/div[4]/div/div/div[2]/div/div[1]/input ${file} ... AND sleep ${sleep} ... AND click id=Import_ua_Ok - ... AND sleep ${sleep_min} + ... AND sleep ${sleep} run keyword if "${Page}" == "TrustedCertificateAuthorities" run keywords sleep ${sleep_min} ... AND click id=children6 ... AND sleep ${sleep_min}