reduce wait time and fix stablity test (#525)

pingcap · May 28, 2019 · f12b599 · f12b599
1 parent b0b71ca
commit f12b599
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/actions.go b/tests/actions.go
@@ -1088,7 +1088,7 @@ func (oa *operatorActions) tidbMembersReadyFn(tc *v1alpha1.TidbCluster) (bool, e
 
 	if upgradePaused() {
 
-		time.Sleep(5 * time.Minute)
+		time.Sleep(30 * time.Second)
 
 		if !pauseCorrect(tidbSet) {
 			return false, fmt.Errorf("pause partition is not correct in upgrade phase [%s/%s] partition %d annotation %d",

diff --git a/tests/cmd/stability/main.go b/tests/cmd/stability/main.go
@@ -242,6 +242,9 @@ func run(oa tests.OperatorActions,
 	oa.CheckTidbClusterStatusOrDie(cluster1)
 	oa.CheckTidbClusterStatusOrDie(cluster2)
 
+	// after upgrade cluster, clean webhook
+	oa.CleanWebHookAndService(operatorCfg)
+
 	// cluster1: bad configuration change case
 	cluster1.TiDBPreStartScript = strconv.Quote("exit 1")
 	oa.UpgradeTidbClusterOrDie(cluster1)
@@ -270,9 +273,6 @@ func run(oa tests.OperatorActions,
 	oa.UpgradeTidbClusterOrDie(cluster2)
 	oa.CheckTidbClusterStatusOrDie(cluster2)
 
-	// after upgrade cluster, clean webhook
-	oa.CleanWebHookAndService(operatorCfg)
-
 	// deploy and check cluster restore
 	oa.DeployTidbClusterOrDie(clusterRestoreTo)
 	oa.CheckTidbClusterStatusOrDie(clusterRestoreTo)