Skip to content

Convert metrics_e2e_test to ginkgo #1443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2020
Merged

Convert metrics_e2e_test to ginkgo #1443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions test/e2e/catalog_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ var _ = Describe("Catalog", func() {
subscription, err := fetchSubscription(crc, testNamespace, subscriptionName, subscriptionStateAtLatestChecker)
require.NoError(GinkgoT(), err)
require.NotNil(GinkgoT(), subscription)
_, err = fetchCSV(GinkgoT(), crc, subscription.Status.CurrentCSV, testNamespace, buildCSVConditionChecker(v1alpha1.CSVPhaseSucceeded))
_, err = fetchCSV(crc, subscription.Status.CurrentCSV, testNamespace, buildCSVConditionChecker(v1alpha1.CSVPhaseSucceeded))
require.NoError(GinkgoT(), err)

ipList, err := crc.OperatorsV1alpha1().InstallPlans(testNamespace).List(context.TODO(), metav1.ListOptions{})
Expand Down Expand Up @@ -390,7 +390,7 @@ var _ = Describe("Catalog", func() {
subscription, err := fetchSubscription(crc, testNamespace, subscriptionName, subscriptionStateAtLatestChecker)
require.NoError(GinkgoT(), err)
require.NotNil(GinkgoT(), subscription)
_, err = fetchCSV(GinkgoT(), crc, subscription.Status.CurrentCSV, testNamespace, buildCSVConditionChecker(v1alpha1.CSVPhaseSucceeded))
_, err = fetchCSV(crc, subscription.Status.CurrentCSV, testNamespace, buildCSVConditionChecker(v1alpha1.CSVPhaseSucceeded))
require.NoError(GinkgoT(), err)
})
It("gRPC address catalog source", func() {
Expand Down Expand Up @@ -519,7 +519,7 @@ var _ = Describe("Catalog", func() {
subscription, err := fetchSubscription(crc, testNamespace, subscriptionName, subscriptionStateAtLatestChecker)
require.NoError(GinkgoT(), err)
require.NotNil(GinkgoT(), subscription)
_, err = fetchCSV(GinkgoT(), crc, subscription.Status.CurrentCSV, testNamespace, csvSucceededChecker)
_, err = fetchCSV(crc, subscription.Status.CurrentCSV, testNamespace, csvSucceededChecker)
require.NoError(GinkgoT(), err)

// Update the catalog's address to point at the other registry pod's cluster ip
Expand Down Expand Up @@ -591,7 +591,7 @@ var _ = Describe("Catalog", func() {
require.NotNil(GinkgoT(), subscription)

// Wait for csv to succeed
_, err = fetchCSV(GinkgoT(), crc, subscription.Status.CurrentCSV, testNamespace, csvSucceededChecker)
_, err = fetchCSV(crc, subscription.Status.CurrentCSV, testNamespace, csvSucceededChecker)
require.NoError(GinkgoT(), err)

// Delete the registry pod
Expand Down Expand Up @@ -676,7 +676,7 @@ var _ = Describe("Catalog", func() {
require.NotNil(GinkgoT(), subscription)

// Wait for csv to succeed
_, err = fetchCSV(GinkgoT(), crc, subscription.Status.CurrentCSV, subscription.GetNamespace(), csvSucceededChecker)
_, err = fetchCSV(crc, subscription.Status.CurrentCSV, subscription.GetNamespace(), csvSucceededChecker)
require.NoError(GinkgoT(), err)

// Delete the registry pod
Expand Down Expand Up @@ -832,7 +832,7 @@ var _ = Describe("Catalog", func() {
require.NotNil(GinkgoT(), subscription)

// Wait for csv to succeed
_, err = fetchCSV(GinkgoT(), crc, subscription.Status.CurrentCSV, subscription.GetNamespace(), csvSucceededChecker)
_, err = fetchCSV(crc, subscription.Status.CurrentCSV, subscription.GetNamespace(), csvSucceededChecker)
require.NoError(GinkgoT(), err)

registryCheckFunc := func(podList *corev1.PodList) bool {
Expand Down Expand Up @@ -923,7 +923,7 @@ var _ = Describe("Catalog", func() {
require.NotNil(GinkgoT(), subscription)

// Wait for csv to succeed
csv, err := fetchCSV(GinkgoT(), crc, subscription.Status.CurrentCSV, subscription.GetNamespace(), csvSucceededChecker)
csv, err := fetchCSV(crc, subscription.Status.CurrentCSV, subscription.GetNamespace(), csvSucceededChecker)
require.NoError(GinkgoT(), err)

// check version of running csv to ensure the latest version (0.9.2) was installed onto the cluster
Expand Down Expand Up @@ -1029,7 +1029,7 @@ var _ = Describe("Catalog", func() {
require.NotNil(GinkgoT(), subscription)

// Wait for busybox v2 csv to succeed and check the replaces field
csv, err := fetchCSV(GinkgoT(), crc, subscription.Status.CurrentCSV, subscription.GetNamespace(), csvSucceededChecker)
csv, err := fetchCSV(crc, subscription.Status.CurrentCSV, subscription.GetNamespace(), csvSucceededChecker)
require.NoError(GinkgoT(), err)
require.Equal(GinkgoT(), "busybox.v1.0.0", csv.Spec.Replaces)

Expand All @@ -1042,7 +1042,7 @@ var _ = Describe("Catalog", func() {
require.NotNil(GinkgoT(), subscription)

// Wait for busybox-dependency v2 csv to succeed and check the replaces field
csv, err = fetchCSV(GinkgoT(), crc, subscription.Status.CurrentCSV, subscription.GetNamespace(), csvSucceededChecker)
csv, err = fetchCSV(crc, subscription.Status.CurrentCSV, subscription.GetNamespace(), csvSucceededChecker)
require.NoError(GinkgoT(), err)
require.Equal(GinkgoT(), "busybox-dependency.v1.0.0", csv.Spec.Replaces)
})
Expand Down
Loading