根据测试报告调整自动化代码

01-TestCase/tsg_ui/ui_administration/AuditLogsCase.robot

@@ -265,7 +265,7 @@ AuditLogsIPLibraries
     CreateIpLibraries    Geo Name    City    Algeria    ${a}    ${a}    ${iplist}    Longitude=-1    Latitude=12.13
     EditIpLibraries    Geo Name    ${a}    Longitude=-2    Latitude=12.13
     DeleteIPLibraries
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
+    Wait Until Element Is Enabled    xpath=//*[@id="app"]/following-sibling::div/p    ${sleep_Wait}
     AdminOpenPages    sidebarsystem_PolicyConfigurationLog    sidebarsystem_PolicyConfigurationLog
     AuditLogsSearch    ${a}    IP Libraries
     Wait Until Element Is Enabled    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div    ${sleep_Wait}

01-TestCase/tsg_ui/ui_administration/MyAccountCase.robot

@@ -70,7 +70,7 @@ MyAccountPasswordNotModified
     [Tags]    Negtive    UI    Administration    My Account
     OpenMyAccountPage
     EditMyAccount    ${username}    ${password}    ${password}
-    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    ${sleep_Wait}
+    Wait Until Element Is Enabled    xpath=//*[@id="app"]/following-sibling::div/p    ${sleep_Wait}
     Assertion    /html/body/div[last()]/p    The password setting cannot be the same as the previous one.
     
 MyAccountTwoPasswordsAreInconsistent

01-TestCase/tsg_ui/ui_settings/CachedIntermediateCertificatesCase.robot

@@ -32,7 +32,7 @@ CachedIntermediateCertificatesSearchIssuer
     OpenPages    sidebarProxy_CertificateManagement    //*[@id="proxyTabs"]/div/ul/li[4]    xpath
     ${Issuer}    get text    xpath=//*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/p/span
     sleep    ${sleep}
-    CachedIntermediateCertificatesSearch    ${Issuer}    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[2]/div/div/div/p/span    Issuer
+    CachedIntermediateCertificatesSearch    ${Issuer}    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[3]/div/div/div/p/span    Issuer
 
 CachedIntermediateCertificatesSearchCertificateFingerprint
     [Tags]    Positive    UI    Settings    CachedIntermediateCertificates

01-TestCase/tsg_ui/ui_settings/DecryptionKeyringsCase.robot

@@ -234,32 +234,32 @@ DecryptionKeyringsNameCreateSpecialChar
  DecryptionKeyringsCARootFileCAMiddleType
     [Tags]    Negtive    UI    Settings    DecryptionKeyrings
     DecryptionKeyringsErrorVerification    CARootFileCAMiddleType    ${path}keyrings//root//ca-cer.pem    ${path}keyrings//root//ca.key    id=certificateType_select1    id=keyringsadd_publicKeyAlgoSelet3
-    ...    /html/body/div[last()]/p    Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
+    ...    //*[@id="app"]/following-sibling::div/p    Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
 
  DecryptionKeyringsCARootFileCAEntityType
     [Tags]    Negtive    UI    Settings    DecryptionKeyrings
     DecryptionKeyringsErrorVerification    CARootFileCAEntityType    ${path}keyrings//root//ca-cer.pem    ${path}keyrings//root//ca.key    id=certificateType_select2    id=keyringsadd_publicKeyAlgoSelet3
-    ...    /html/body/div[last()]/p    Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
+    ...    //*[@id="app"]/following-sibling::div/p    Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
 
 DecryptionKeyringsCAMiddleFileCARootType
     [Tags]    Negtive    UI    Settings    DecryptionKeyrings
     DecryptionKeyringsErrorVerification    CAMiddleFileCARootType    ${path}keyrings//Intermediate//camiddle.chain.pem    ${path}keyrings//Intermediate//camiddle.key    id=certificateType_select0    id=keyringsadd_publicKeyAlgoSelet3
-    ...    /html/body/div[last()]/p    Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
+    ...    //*[@id="app"]/following-sibling::div/p    Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
 
 DecryptionKeyringsCAMiddleFileCAEntityType
     [Tags]    Negtive    UI    Settings    DecryptionKeyrings
     DecryptionKeyringsErrorVerification    CAMiddleFileCAEntityType    ${path}keyrings//Intermediate//camiddle.chain.pem    ${path}keyrings//Intermediate//camiddle.key    id=certificateType_select2    id=keyringsadd_publicKeyAlgoSelet3
-    ...    /html/body/div[last()]/p    Incorrect certificate type
+    ...    //*[@id="app"]/following-sibling::div/p    Incorrect certificate type
 
 DecryptionKeyringsCAEntityFileCARootType
     [Tags]    Negtive    UI    Settings    DecryptionKeyrings
     DecryptionKeyringsErrorVerification    CAEntityFileCARootType    ${path}keyrings//end-entity//caentity.chain.pem    ${path}keyrings//end-entity//caentity.key    id=certificateType_select0    id=keyringsadd_publicKeyAlgoSelet3
-    ...    /html/body/div[last()]/p    Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
+    ...    //*[@id="app"]/following-sibling::div/p    Incorrect certificate chain length (root certificate must be 1, intermediate certificate and end entity certificate must be greater than 2.)
 
 DecryptionKeyringsCAEntityFileCAMiddleType
     [Tags]    Negtive    UI    Settings    DecryptionKeyrings
     DecryptionKeyringsErrorVerification    CAEntityFileCAMiddleType    ${path}keyrings//end-entity//caentity.chain.pem    ${path}keyrings//end-entity//caentity.key    id=certificateType_select1    id=keyringsadd_publicKeyAlgoSelet3
-    ...    /html/body/div[last()]/p    Incorrect certificate type
+    ...    //*[@id="app"]/following-sibling::div/p    Incorrect certificate type
 
 DecryptionKeyringsNullName
     [Tags]    Negtive    UI    Settings    DecryptionKeyrings

01-TestCase/tsg_ui/ui_settings/SNATIPPoolsCase.robot

@@ -10,12 +10,12 @@ CreateSNATIPPoolsEnter
     CreateSNATIPPools    ${TEST NAME}    1    ${iplist}    j=2
     SNATIPDelete    ${TEST NAME}    Name
     
-CreateSNATIPPoolsHistoryActiveIP
-    [Tags]    Positive    UI    Settings    SNATIPPools
-    ${ip}=    SearchHistoryActiveIP    1
-    ${iplist}    create list    ${ip}
-    CreateSNATIPPools    ${TEST NAME}    2    ${iplist}
-    SNATIPDelete    ${TEST NAME}    Name   
+# CreateSNATIPPoolsHistoryActiveIP
+    # [Tags]    Positive    UI    Settings    SNATIPPools
+    # ${ip}=    SearchHistoryActiveIP    1
+    # ${iplist}    create list    ${ip}
+    # CreateSNATIPPools    ${TEST NAME}    2    ${iplist}
+    # SNATIPDelete    ${TEST NAME}    Name   
    
 EditSNATIPPoolsName
     [Tags]    Positive    name    Settings    SNATIPPools

02-Keyword/tsg_ui/administration/Administration.robot

@@ -422,7 +422,7 @@ LoginRestrictions-SearchIP
     sleep    ${sleep_min}
     
 LoginRestrictions-DeleteIP
-    sleep    ${sleep}
+    Wait Until Element Is Enabled    xpath=/html/body/div/div/div[3]/div[2]/div/div[1]/div/div[2]/div/div/form/div[2]/div/div[1]/div[2]/div[1]/div/div[last()]/div/div/div[2]/i[2]    ${sleep_Wait}
     ${text}    Get Element Attribute     xpath=/html/body/div/div/div[3]/div[2]/div/div[1]/div/div[2]/div/div/form/div[2]/div/div[1]/div[2]/div[1]/div/div[last()]/div/div/div[2]/i[2]    id
     click element    id=${text}
     sleep    ${sleep}

02-Keyword/tsg_ui/setting/Settings.robot

@@ -463,6 +463,7 @@ EditInsertScripts
     ...    AND    click    //span[.="${jstype}"]    
     sleep    ${sleep_min}
     click    id=insertAddOk1    #点击ok提交
+    Wait Until Element Is Enabled    id=insertAdd    ${sleep_Wait}
     run keyword if    "${search}"=="id"    run keywords    sleep    ${sleep_min}
     ...    AND    Settings-Search    ${id-name}    ${search}    #搜索框的关键字
     ...    ELSE IF    "${search}"=="name"    run keywords    sleep    ${sleep_min}
@@ -687,10 +688,10 @@ CreateDecryptionKeyrings
     ...    ${PrivateKeyType}：私钥类型
     #打开浏览器
     #ui-login    lyf    111111
-    sleep    ${sleep_min}
+    sleep    ${sleep}
     click    id=children6    #点击一级目录Settings
-    sleep    ${sleep_min}
-    click    id=sidebarProxy_CertificateManagement    #点击二级目录Trusted Certificate Authorities
+    sleep    ${sleep}
+    click    id=sidebarProxy_CertificateManagement
     sleep    ${sleep}
     click    xpath=//*[@id="proxyTabs"]/div/ul/li[2]    #点击Decryption Keyrings
     sleep    ${sleep_min}
@@ -1731,11 +1732,11 @@ Req_Res_Body
 
 CreateIpLibraries
     [Arguments]    ${type1}    ${type}    ${Continent/Country}    ${GeoNameID}    ${City}    ${ip}    ${j}=1    ${Country}=null    ${Longitude}=null    ${Latitude}=null
-    sleep    ${sleep_min}
+    sleep    ${sleep}
     click    id=children6    #点击一级目录Settings
-    sleep    ${sleep_min}
+    sleep    ${sleep}
     click    id=sidebarAdvanced
-    sleep    ${sleep_min}
+    sleep    ${sleep}
     click    id=Advanced/ipLibrary    #点击二级目录IP_Libraries
     sleep    ${sleep}
     click    id=tagAdd    #点击Create按钮
@@ -2198,7 +2199,7 @@ Switch_Geographic_Locations
     input    id=objectName_seach    ${Continent/Country}
     sleep    ${sleep_min}
     press keys    id=objectName_seach    ENTER
-    sleep    ${sleep}
+    sleep    3
     click    xpath=//*[@id="right_locationList"]/div[2]/div[1]/div[2]/div/div
     sleep    ${sleep_min}
     click    id=interceptionadd_allcancelobject9
@@ -2269,9 +2270,9 @@ OpenPages
     ...    ${Three-levelMenu}：三级菜单
     ...    ${Targeting} :三级菜单 定位方式 默认不输入为id
     click    id=children6   
-    sleep    ${sleep_min}
+    sleep    ${sleep}
     click    id=${SecondaryMenu}
-    sleep    ${sleep_min}
+    sleep    ${sleep}
     run keyword if    "${Targeting}"=="null"    run keywords    sleep    ${sleep_min}
     ...    AND    click    id=${Three-levelMenu}
     run keyword if    "${Targeting}"=="xpath"    run keywords    sleep    ${sleep_min}
@@ -2613,14 +2614,14 @@ SortButton
     ${One}    Set Variable    [1]
     ${Two}    Set Variable    [2]
     ${assert}    Set Variable if    "${page}" == "Trusted Certificate Authorities"    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
-    ...    "${page}" == "Decryption Keyrings"    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[3]/td[1]/div/div/div/p/span
+    ...    "${page}" == "Decryption Keyrings"    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
     ...    "${page}" == "Cached Intermediate Certificates"    //*[@id="ly-table1-listcontent"]/div/div[3]/table/tbody/tr[1]/td[1]/div/div/div/p/span
     sleep    ${sleep_min}
     ${text1}    get text    xpath=${assert}
     click    xpath=${button}${One}
     sleep    ${sleep}
     ${text2}    get text    xpath=${assert}
-    click    xpath=${button}${Two}
+    click    xpath=${button}${One}
     sleep    ${sleep}
     ${text3}    get text    xpath=${assert}
     Should Not Be Equal    ${text1}    ${text2}