diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index d0f48509..1b43ab0c 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -51,7 +51,27 @@ func (f *Framework) AfterSuit() error { } func (f *Framework) AfterEach() error { - return f.client.DeleteGameServerSet() + return wait.PollImmediate(5*time.Second, 3*time.Minute, + func() (done bool, err error) { + err = f.client.DeleteGameServerSet() + if err != nil && !apierrors.IsNotFound(err) { + { + return false, err + } + } + + labelSelector := labels.SelectorFromSet(map[string]string{ + gamekruiseiov1alpha1.GameServerOwnerGssKey: client.GameServerSet, + }).String() + podList, err := f.client.GetPodList(labelSelector) + if err != nil { + return false, err + } + if len(podList.Items) != 0 { + return false, nil + } + return true, nil + }) } func (f *Framework) DeployGameServerSet() (*gamekruiseiov1alpha1.GameServerSet, error) { @@ -194,6 +214,7 @@ func (f *Framework) WaitForUpdated(gss *gamekruiseiov1alpha1.GameServerSet, name return false, nil } } + fmt.Printf("id %d updated. Passed.\n", id) } else { // should not be updated for _, c := range pod.Status.ContainerStatuses { @@ -201,6 +222,7 @@ func (f *Framework) WaitForUpdated(gss *gamekruiseiov1alpha1.GameServerSet, name return false, nil } } + fmt.Printf("id %d not updated. Passed.\n", id) } } return true, nil