Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions pkg/internal/integration/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ import (
"github.com/stretchr/testify/suite"
"golang.org/x/oauth2"
v1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
)
Expand Down Expand Up @@ -181,6 +183,39 @@ func (s *IntegrationTestSuite) TearDownTest() {
errors++
}

// Wait up to two minutes for the namespace to be deleted
timeout := 120 * time.Second

ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()

err = wait.PollUntilContextCancel(ctx, 1*time.Second, true,
func(ctx context.Context) (bool, error) {
_, err := s.k8s.CoreV1().Namespaces().Get(
ctx,
s.ns,
metav1.GetOptions{},
)

// Not found, we are done
if k8serrors.IsNotFound(err) {
return true, nil
}

// Another error, fail
if err != nil {
return false, err
}

// Found, try again
return false, nil
})

if err != nil {
s.T().Logf("took too long to delete namespace %s: %s", s.ns, err)
errors++
}

if errors > 0 {
panic(fmt.Sprintf("failed cleanup test: %d errors", errors))
}
Expand Down
Loading