From cc167fa0b91e3fb3fbccdf0ae19c98f8736cff00 Mon Sep 17 00:00:00 2001 From: Peter Stachowski Date: Fri, 16 Dec 2016 17:50:55 -0800 Subject: [PATCH] Have inst-error delete before inst-create-wait Before we wait for the the instance-create stuff to finish, make sure the error instances are deleted. That will free up resources faster and hopefully make the gate run quicker. Do the same thing with the module- and cfggrp- instances (before the backup ones are created). Change-Id: I6c70975538f1e2f656c31cfaf63fc69e2be821c0 Depends-On: I3bbe3bafa7ea3e627272103ac16a38f6a32a8a06 --- trove/tests/scenario/groups/backup_group.py | 8 +++----- trove/tests/scenario/groups/instance_create_group.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/trove/tests/scenario/groups/backup_group.py b/trove/tests/scenario/groups/backup_group.py index edfc6e4e6e..273a38cb71 100644 --- a/trove/tests/scenario/groups/backup_group.py +++ b/trove/tests/scenario/groups/backup_group.py @@ -31,8 +31,8 @@ class BackupRunnerFactory(test_runners.RunnerFactory): @test(depends_on_groups=[groups.INST_CREATE_WAIT], groups=[GROUP, groups.BACKUP, groups.BACKUP_CREATE], - runs_after_groups=[groups.MODULE_INST_CREATE_WAIT, - groups.CFGGRP_INST_CREATE_WAIT]) + runs_after_groups=[groups.MODULE_INST_DELETE, + groups.CFGGRP_INST_DELETE]) class BackupCreateGroup(TestGroup): """Test Backup Create functionality.""" @@ -209,9 +209,7 @@ class BackupIncCreateGroup(TestGroup): @test(depends_on_groups=[groups.BACKUP_CREATE], - groups=[GROUP, groups.BACKUP_INST, groups.BACKUP_INST_CREATE], - runs_after_groups=[groups.MODULE_INST_DELETE, - groups.CFGGRP_INST_DELETE]) + groups=[GROUP, groups.BACKUP_INST, groups.BACKUP_INST_CREATE]) class BackupInstCreateGroup(TestGroup): """Test Backup Instance Create functionality.""" diff --git a/trove/tests/scenario/groups/instance_create_group.py b/trove/tests/scenario/groups/instance_create_group.py index 228be246b7..c368e27617 100644 --- a/trove/tests/scenario/groups/instance_create_group.py +++ b/trove/tests/scenario/groups/instance_create_group.py @@ -59,7 +59,7 @@ class InstanceCreateGroup(TestGroup): @test(depends_on_groups=[groups.INST_CREATE], groups=[GROUP, groups.INST_CREATE_WAIT], runs_after_groups=[groups.MODULE_CREATE, groups.CFGGRP_CREATE, - groups.INST_ERROR_CREATE_WAIT]) + groups.INST_ERROR_DELETE]) class InstanceCreateWaitGroup(TestGroup): """Test that Instance Create Completes."""