add check for expected output when deleting subnets with newton 42/48142/2
authorJamo Luhrsen <jluhrsen@redhat.com>
Wed, 9 Nov 2016 01:21:10 +0000 (17:21 -0800)
committerJamo Luhrsen <jluhrsen@redhat.com>
Wed, 9 Nov 2016 18:45:36 +0000 (10:45 -0800)
the output returned with newton is slightly different, so adding a regexp
check instead so we can match either format.

Change-Id: I58f60c077ee5a2eb14d1d7683236090b8f92dde3
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
csit/libraries/OpenStackOperations.robot

index 36b10716e0cc446de960b789e61ab1e969dea1b2..83446a3161430e65f2c9549452fc936210b9b2c6 100644 (file)
@@ -64,7 +64,7 @@ Delete Network
     ${output}=    Write Commands Until Prompt    neutron -v net-delete ${network_name}    30s
     Close Connection
     Log    ${output}
-    Should Contain    ${output}    Deleted network: ${network_name}
+    Should Match Regexp    ${output}    Deleted network: ${network_name}|Deleted network\\(s\\): ${network_name}
 
 Create SubNet
     [Arguments]    ${network_name}    ${subnet}    ${range_ip}
@@ -135,7 +135,7 @@ Delete SubNet
     ${output}=    Write Commands Until Prompt    neutron -v subnet-delete ${subnet}
     Close Connection
     Log    ${output}
-    Should Contain    ${output}    Deleted subnet: ${subnet}
+    Should Match Regexp    ${output}    Deleted subnet: ${subnet}|Deleted subnet\\(s\\): ${subnet}
 
 Verify No Gateway Ips
     [Documentation]    Verifies the Gateway Ips removed with dump flow.