Skip to content

Commit

Permalink
Merge pull request #8585 from smarterclayton/retry_test_acl
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot committed Apr 23, 2016
2 parents 1d84db5 + 577972c commit 642f0af
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions test/extended/util/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ import (
"github.com/spf13/cobra"

kapi "k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors"
kclient "k8s.io/kubernetes/pkg/client/unversioned"
clientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/test/e2e"

_ "github.com/openshift/origin/pkg/api/install"
Expand Down Expand Up @@ -148,6 +150,17 @@ func (c *CLI) SetupProject(name string, kubeClient *kclient.Client, _ map[string
e2e.Logf("Failed to create a project and namespace %q: %v", c.Namespace(), err)
return nil, err
}
if err := wait.ExponentialBackoff(kclient.DefaultBackoff, func() (bool, error) {
if _, err := c.KubeREST().Pods(c.Namespace()).List(kapi.ListOptions{}); err != nil {
if apierrs.IsForbidden(err) {
e2e.Logf("Waiting for user to have access to the namespace")
return false, nil
}
}
return true, nil
}); err != nil {
return nil, err
}
return &kapi.Namespace{ObjectMeta: kapi.ObjectMeta{Name: c.Namespace()}}, err
}

Expand Down

0 comments on commit 642f0af

Please sign in to comment.