Skip to content

Use generated namespaces in e2e tests #3042

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
Oct 4, 2023
Merged

Use generated namespaces in e2e tests #3042

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
202 changes: 101 additions & 101 deletions test/e2e/catalog_e2e_test.go
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions test/e2e/catalog_exclusion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const magicCatalogDir = "magiccatalog"

var _ = Describe("Global Catalog Exclusion", func() {
var (
testNamespace corev1.Namespace
generatedNamespace corev1.Namespace
determinedE2eClient *util.DeterminedE2EClient
operatorGroup operatorsv1.OperatorGroup
localCatalog *MagicCatalog
Expand All @@ -42,7 +42,7 @@ var _ = Describe("Global Catalog Exclusion", func() {
TargetNamespaces: []string{e2eTestNamespace},
},
}
testNamespace = SetupGeneratedTestNamespaceWithOperatorGroup(e2eTestNamespace, operatorGroup)
generatedNamespace = SetupGeneratedTestNamespaceWithOperatorGroup(e2eTestNamespace, operatorGroup)

By("creating a broken catalog in the global namespace")
globalCatalog := &v1alpha1.CatalogSource{
Expand All @@ -66,7 +66,7 @@ var _ = Describe("Global Catalog Exclusion", func() {
var err error = nil

fbcPath := filepath.Join(testdataDir, magicCatalogDir, "fbc_initial.yaml")
localCatalog, err = NewMagicCatalogFromFile(determinedE2eClient, testNamespace.GetName(), localCatalogName, fbcPath)
localCatalog, err = NewMagicCatalogFromFile(determinedE2eClient, generatedNamespace.GetName(), localCatalogName, fbcPath)
Expect(err).To(Succeed())

// deploy catalog blocks until the catalog has reached a ready state or fails
Expand All @@ -79,7 +79,7 @@ var _ = Describe("Global Catalog Exclusion", func() {
})

AfterEach(func() {
TeardownNamespace(testNamespace.GetName())
TeardownNamespace(generatedNamespace.GetName())
})

When("a subscription referring to the local catalog is created", func() {
Expand All @@ -88,7 +88,7 @@ var _ = Describe("Global Catalog Exclusion", func() {
BeforeEach(func() {
subscription = &v1alpha1.Subscription{
ObjectMeta: metav1.ObjectMeta{
Namespace: testNamespace.GetName(),
Namespace: generatedNamespace.GetName(),
Name: genName("local-subscription-"),
},
Spec: &v1alpha1.SubscriptionSpec{
Expand Down
77 changes: 39 additions & 38 deletions test/e2e/crd_e2e_test.go
View file
Open in desktop

Large diffs are not rendered by default.

Loading