Fix logic in prefbasedshard creation after restart

[integration/test.git] / csit / suites / controller / dom_data_broker / explicit_leader_movement_prefbasedshard.robot

diff --git a/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
index 0adbfd77ad4fdfb6310646d9f7df83efdd6e5f59..6d8bdd5389dcd0449ab42d5cb2cb2ed710a9843d 100644 (file)
--- a/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
@@ -11,12 +11,12 @@ Documentation     DOMDataBroker testing: Explicit Leader Movement
 ...               leader is moved as the result of explicit application request. This is performed
 ...               by having a steady-stream producer execute operations against the shard and then
 ...               initiate shard leader shutdown, then the producer is shut down cleanly.
-Suite Setup       BuiltIn.Run_Keywords    SetupUtils.Setup_Utils_For_Setup_And_Teardown    http_timeout=30
+Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown    http_timeout=30
+Suite Teardown    SSHLibrary.Close_All_Connections
+Test Setup        BuiltIn.Run_Keywords    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 ...               AND    DdbCommons.Create_Prefix_Based_Shard_And_Verify
-Suite Teardown    BuiltIn.Run_Keywords    DdbCommons.Remove_Prefix_Based_Shard_And_Verify
-...               AND    SSHLibrary.Close_All_Connections
-Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
+Test Teardown     BuiltIn.Run_Keywords    DdbCommons.Remove_Prefix_Based_Shard_And_Verify
+...               AND    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Default Tags      critical
 Test Template     DdbCommons.Explicit_Leader_Movement_PrefBasedShard_Test_Templ
 Library           SSHLibrary
@@ -29,18 +29,22 @@ Local_To_Remote_Movement
     local    remote
 
 Restart1
-    [Documentation]    Restart odl
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     [Template]
     DdbCommons.Restart_Test_Templ
+    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 
 Remote_To_Remote_Movement
     [Documentation]    Leader moves from one remote to other remote node during transaction producing.
     remote    remote
 
 Restart2
-    [Documentation]    Restart odl
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     [Template]
     DdbCommons.Restart_Test_Templ
+    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 
 Remote_To_Local_Movement
     [Documentation]    Leader moves from remote to local node during transaction producing.