Skip to content

Commit

Permalink
Merge pull request operator-framework#643 from ecordell/e2e-registry-pod
Browse files Browse the repository at this point in the history
test(catalog): add an e2e test verifying that the rh-operators catalog starts
  • Loading branch information
openshift-merge-robot authored Dec 28, 2018
2 parents 4d9b561 + 7f6e11b commit 03c0bcf
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions test/e2e/catalog_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import (
"github.com/stretchr/testify/require"
appsv1 "k8s.io/api/apps/v1"
extv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/util/wait"

"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
Expand Down Expand Up @@ -77,6 +79,26 @@ func TestCatalogLoadingBetweenRestarts(t *testing.T) {
t.Logf("Catalog source sucessfully loaded after rescale")
}

func TestDefaultCatalogLoading(t *testing.T) {
defer cleaner.NotifyTestComplete(t, true)
c := newKubeClient(t)
crc := newCRClient(t)

catalogSource, err := fetchCatalogSource(t, crc, "rh-operators", operatorNamespace, catalogSourceRegistryPodSynced)
require.NoError(t, err)
requirement, err := labels.NewRequirement("olm.catalogSource", selection.Equals, []string{catalogSource.GetName()})
require.NoError(t, err)
selector := labels.NewSelector().Add(*requirement).String()
pods, err := c.KubernetesInterface().CoreV1().Pods(operatorNamespace).List(metav1.ListOptions{LabelSelector: selector})
require.NoError(t, err)
for _, p := range pods.Items {
for _, s := range p.Status.ContainerStatuses {
require.True(t, s.Ready)
require.Zero(t, s.RestartCount)
}
}
}

func getOperatorDeployment(c operatorclient.ClientInterface, namespace string, operatorLabels labels.Set) (*appsv1.Deployment, error) {
deployments, err := c.ListDeploymentsWithLabels(namespace, operatorLabels)
if err != nil || deployments == nil || len(deployments.Items) != 1 {
Expand Down

0 comments on commit 03c0bcf

Please sign in to comment.