From fff3db8474275f5447612b9fcbe0c257d984cd76 Mon Sep 17 00:00:00 2001 From: Rogelio Sanchez Date: Thu, 19 Apr 2018 13:33:40 -0500 Subject: [PATCH 1/2] Add retry on vSAN DOM objects in DS check --- .../5-6-1-VSAN-Simple.robot | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot index 34395af611..285ad214a3 100644 --- a/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot +++ b/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot @@ -34,7 +34,7 @@ Simple VSAN Setup \ Exit For Loop If ${status} Set Suite Variable @{list} ${user}-${name}.vcva-${VC_VERSION} ${user}-${name}.esx.0 ${user}-${name}.esx.1 ${user}-${name}.esx.2 ${user}-${name}.esx.3 ${user}-${name}.nfs.0 ${user}-${name}.iscsi.0 - + Log To Console Set environment variables up for GOVC Set Environment Variable GOVC_URL ${vc-ip} Set Environment Variable GOVC_USERNAME Administrator@vsphere.local @@ -57,10 +57,16 @@ Simple VSAN Setup Set Environment Variable TEST_RESOURCE cls Set Environment Variable TEST_TIMEOUT 15m + +Check VSAN DOMs In Datastore + [Arguments] ${test_datastore} + ${out}= Run govc datastore.vsan.dom.ls -ds ${test_datastore} -l -o + Should Be Empty ${out} + + *** Test Cases *** Simple VSAN - ${out}= Run govc datastore.vsan.dom.ls -ds %{TEST_DATASTORE} -l -o - Should Be Empty ${out} + Wait Until Keyword Succeeds 10x 30s Check VSAN DOMs In Datastore %{TEST_DATASTORE} Custom Testbed Keepalive /dbc/pa-dbc1111/mhagen @@ -68,5 +74,5 @@ Simple VSAN Run Regression Tests Cleanup VIC Appliance On Test Server - ${out}= Run govc datastore.vsan.dom.ls -ds %{TEST_DATASTORE} -l -o - Should Be Empty ${out} + Wait Until Keyword Succeeds 10x 30s Check VSAN DOMs In Datastore %{TEST_DATASTORE} + From 0f3da37f5abfc97df2ed2e1533c0f10d12a32fb9 Mon Sep 17 00:00:00 2001 From: Rogelio Sanchez Date: Thu, 19 Apr 2018 17:20:02 -0500 Subject: [PATCH 2/2] Update per review comments --- .../Group5-Functional-Tests/5-6-1-VSAN-Simple.robot | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot index 285ad214a3..0efe749b44 100644 --- a/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot +++ b/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot @@ -1,4 +1,4 @@ -# Copyright 2016-2017 VMware, Inc. All Rights Reserved. +# Copyright 2016-2018 VMware, Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -75,4 +75,3 @@ Simple VSAN Cleanup VIC Appliance On Test Server Wait Until Keyword Succeeds 10x 30s Check VSAN DOMs In Datastore %{TEST_DATASTORE} -