diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Tests.robot
index cebb7e2..bee280b 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Allow_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Tests.robot
@@ -421,5 +421,4 @@ Proxy-Policy-allow-00014
     insert_policyId_to_file1    intercept_allow_policyId13    ${policyId1}
     insert_policyId_to_file1    allow_policyId13    ${policyId2}
     
-Proxy-Policy-allow-00015
-    [Tags]    the minimum match
+
diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot
index 2497b43..017491f 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot
@@ -12,7 +12,7 @@ Resource          ../../../03-Variable/ApplicationID.txt
 SecurityPolicy-Deny-SIP-00001
     [Tags]    calling ip source
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-SIP-00001    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"SIP","method":"drop"}      isValid=${0}    appIdObjects=${SIP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-SIP-00001    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"SIP","method":"drop"}      isValid=${1}    appIdObjects=${SIP_ID}
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     ${policyId}    Get-Pids    ${policyId}
@@ -69,7 +69,7 @@ SecurityPolicy-Deny-SIP-00005
     ${objectDict}    Create Dictionary    objectType=ip    objectSubType=endpoint    isValid=${1}    addItemList=${addItemLists}
     ${rescode}    ${objectId}    AddObjects    ${1}    ${objectDict}
     Comment    创建安全策略
-    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-SIP-00005    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"SIP","method":"drop"}      source=${objectId}|TSG_SECURITY_SOURCE_ADDR    isValid=${0}    appIdObjects=${SIP_ID}
+    ${policyDict}    Create Dictionary    policyName=SecurityPolicy-Deny-SIP-00005    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"SIP","method":"drop"}      source=${objectId}|TSG_SECURITY_SOURCE_ADDR    isValid=${1}    appIdObjects=${SIP_ID}
     log    ${policyDict}
     ${rescode}    ${policyId}    AddPolicies    1    ${policyDict}    v2
     ${policyId}    Get-Pids    ${policyId}
diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot
index d8bdd1e..eba6341 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot
@@ -27,7 +27,8 @@ SecurityPolicy-Deny-Mail-00001
     ${邮件正文}    Set Variable    Простопорно
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
     Comment    改变监控策略
     ${policyDict}    Create Dictionary    policyId=${deny_mail_policyId}    source=${deny_mail_objectId32}|TSG_SECURITY_SOURCE_LOCATION     policyName=SecurityPolicy-Deny-Mail-00001-1    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${deny_mail_objectId33}|TSG_FIELD_MAIL_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     log    ${policyDict}
@@ -46,7 +47,8 @@ SecurityPolicy-Deny-Mail-00001
     ${邮件正文}    Set Variable    Простопорно
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
     
 SecurityPolicy-Deny-Mail-00002
     Comment    功能端验证
@@ -63,7 +65,8 @@ SecurityPolicy-Deny-Mail-00002
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
     Comment    改变监控策略
     ${policyDict}    Create Dictionary    policyId=${deny_mail_policyId1}    policyName=SecurityPolicy-Deny-Mail-00002-1    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"drop"}    filterList=${deny_mail_objectId34}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     log    ${policyDict}
@@ -82,7 +85,8 @@ SecurityPolicy-Deny-Mail-00002
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
     
 SecurityPolicy-Deny-Mail-00003
     Comment    功能端验证
@@ -99,7 +103,8 @@ SecurityPolicy-Deny-Mail-00003
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
     Comment    改变监控策略
     ${policyDict}    Create Dictionary    policyId=${deny_mail_policyId1}    policyName=SecurityPolicy-Deny-Mail-00003-1    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}    filterList=${deny_mail_objectId36}|TSG_FIELD_MAIL_FROM,${deny_mail_objectId35}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     log    ${policyDict}
@@ -118,7 +123,8 @@ SecurityPolicy-Deny-Mail-00003
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
     
 SecurityPolicy-Deny-Mail-00004
     Comment    功能端验证
@@ -135,7 +141,8 @@ SecurityPolicy-Deny-Mail-00004
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00005
     Comment    功能端验证
@@ -152,7 +159,8 @@ SecurityPolicy-Deny-Mail-00005
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00006
     Comment    功能端验证
@@ -169,7 +177,8 @@ SecurityPolicy-Deny-Mail-00006
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00007
     Comment    功能端验证
@@ -186,7 +195,8 @@ SecurityPolicy-Deny-Mail-00007
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00008
     Comment    功能端验证
@@ -203,7 +213,8 @@ SecurityPolicy-Deny-Mail-00008
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00009
     Comment    功能端验证
@@ -220,7 +231,8 @@ SecurityPolicy-Deny-Mail-00009
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00010
     Comment    功能端验证
@@ -237,7 +249,8 @@ SecurityPolicy-Deny-Mail-00010
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00011
     Comment    功能端验证
@@ -254,7 +267,8 @@ SecurityPolicy-Deny-Mail-00011
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00012
     Comment    功能端验证
@@ -271,7 +285,8 @@ SecurityPolicy-Deny-Mail-00012
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00013
     Comment    功能端验证
@@ -288,7 +303,8 @@ SecurityPolicy-Deny-Mail-00013
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00014
     Comment    功能端验证
@@ -305,7 +321,8 @@ SecurityPolicy-Deny-Mail-00014
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
 
 SecurityPolicy-Deny-Mail-00015
     Comment    功能端验证
@@ -322,7 +339,8 @@ SecurityPolicy-Deny-Mail-00015
     ${邮件正文}    Set Variable    good
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
     
 SecurityPolicy-Deny-Mail-00016
     Comment    开启阻断策略
@@ -344,7 +362,8 @@ SecurityPolicy-Deny-Mail-00016
     ${邮件正文}    Set Variable    good
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_fail
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_fail
+    ...    ELSE    should contain    ${发送邮件返回结果}    fail
     Comment    关闭阻断策略
     ${policyDict}    Create Dictionary    policyId=${deny_mail_policyId15}    policyName=SecurityPolicy-Deny-Mail-00016    policyType=tsg_security    policyDesc=autotest    action=deny    userRegion={"protocol":"MAIL","method":"rst"}       isValid=${0}    appIdObjects=${MAIL_ID}
     log    ${policyDict}
diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot
index b1dc634..528c226 100644
--- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot
@@ -27,7 +27,8 @@ SecurityPolicy-Momitor-Mail-00001
     ${邮件正文}    Set Variable    zzzzzzz
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     Comment    改变监控策略
     ${policyDict}    Create Dictionary    policyId=${monitor_mail_policyId}    source=${monitor_mail_objectId32}|TSG_SECURITY_SOURCE_LOCATION     policyName=SecurityPolicy-Monitor-Mail-00001-1    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${monitor_mail_objectId33}|TSG_FIELD_MAIL_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     log    ${policyDict}
@@ -46,7 +47,8 @@ SecurityPolicy-Momitor-Mail-00001
     ${邮件正文}    Set Variable    zzzzzzz
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    30
     
 SecurityPolicy-Momitor-Mail-00002
@@ -64,7 +66,8 @@ SecurityPolicy-Momitor-Mail-00002
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     Comment    改变监控策略
     ${policyDict}    Create Dictionary    policyId=${monitor_mail_policyId1}    policyName=SecurityPolicy-Monitor-Mail-00002-1    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${monitor_mail_objectId34}|TSG_FIELD_MAIL_ATT_CONTENT    isValid=${1}    appIdObjects=${MAIL_ID}
     log    ${policyDict}
@@ -83,7 +86,8 @@ SecurityPolicy-Momitor-Mail-00002
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    31
     
 SecurityPolicy-Momitor-Mail-00003
@@ -101,7 +105,8 @@ SecurityPolicy-Momitor-Mail-00003
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     Comment    改变监控策略
     ${policyDict}    Create Dictionary    policyId=${monitor_mail_policyId2}    policyName=SecurityPolicy-Monitor-Mail-00003-1    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${monitor_mail_objectId36}|TSG_FIELD_MAIL_FROM,${monitor_mail_objectId35}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     log    ${policyDict}
@@ -120,7 +125,8 @@ SecurityPolicy-Momitor-Mail-00003
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    35
     
 SecurityPolicy-Momitor-Mail-00004
@@ -138,7 +144,8 @@ SecurityPolicy-Momitor-Mail-00004
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    45
     
 SecurityPolicy-Momitor-Mail-00005
@@ -156,7 +163,8 @@ SecurityPolicy-Momitor-Mail-00005
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    66
     
 SecurityPolicy-Momitor-Mail-00006
@@ -174,7 +182,8 @@ SecurityPolicy-Momitor-Mail-00006
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    80
 
 SecurityPolicy-Momitor-Mail-00007
@@ -192,7 +201,8 @@ SecurityPolicy-Momitor-Mail-00007
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    99
 
 SecurityPolicy-Momitor-Mail-00008
@@ -210,7 +220,8 @@ SecurityPolicy-Momitor-Mail-00008
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     Comment    改变监控策略
     ${policyDict}    Create Dictionary    policyId=${monitor_mail_policyId7}    policyName=SecurityPolicy-Monitor-Mail-00008-1    policyType=tsg_security    policyDesc=autotest    action=monitor    userRegion={"protocol":"MAIL"}    filterList=${monitor_mail_objectId37}|TSG_FIELD_MAIL_TO,${monitor_mail_objectId12}|TSG_FIELD_MAIL_SUBJECT    isValid=${1}    appIdObjects=${MAIL_ID}
     log    ${policyDict}
@@ -230,7 +241,8 @@ SecurityPolicy-Momitor-Mail-00008
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    111
     
 SecurityPolicy-Momitor-Mail-00009
@@ -248,7 +260,8 @@ SecurityPolicy-Momitor-Mail-00009
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    120
 
 SecurityPolicy-Momitor-Mail-00010
@@ -266,7 +279,8 @@ SecurityPolicy-Momitor-Mail-00010
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    175
 
 SecurityPolicy-Momitor-Mail-00011
@@ -284,7 +298,8 @@ SecurityPolicy-Momitor-Mail-00011
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
 
 SecurityPolicy-Momitor-Mail-00012
     Comment    功能端验证
@@ -301,8 +316,9 @@ SecurityPolicy-Momitor-Mail-00012
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
-    sleep    75
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
+    sleep    25
 
 SecurityPolicy-Momitor-Mail-00013
     Comment    功能端验证
@@ -319,7 +335,8 @@ SecurityPolicy-Momitor-Mail-00013
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    80
 
 SecurityPolicy-Momitor-Mail-00014
@@ -337,7 +354,8 @@ SecurityPolicy-Momitor-Mail-00014
     ${邮件正文}    Set Variable    朱明明content
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success
     sleep    92    
 
 SecurityPolicy-Momitor-Mail-00015
@@ -355,4 +373,5 @@ SecurityPolicy-Momitor-Mail-00015
     ${邮件正文}    Set Variable    good
     ${发送邮件返回结果}    EmailSendFull    ${Smtp服务器}    ${Smtp服务器端口}    ${邮箱账号}    ${邮箱密码}    ${邮件主题}    ${发送者}    ${接收者}    ${抄送者}    ${密送者}    ${邮件正文}    ${附件}
     Log    ${发送邮件返回结果}
-    should contain    ${发送邮件返回结果}    mail_success
+    run keyword if     '${systemType}'=='Windows'    should contain    ${发送邮件返回结果}    mail_success
+    ...    ELSE    should contain    ${发送邮件返回结果}    success