Skip to content

Fix the namespace acceptance tests #381

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
ramya-bangera merged 1 commit into from
Feb 22, 2024
+4 −22
Merged

Fix the namespace acceptance tests #381

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
4 changes: 2 additions & 2 deletions internal/resources/namespace/data_source_namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ func TestAcceptanceForNamespaceDataSource(t *testing.T) {
resourceName := fmt.Sprintf("%s.%s", namespaceResource, namespaceResourceVar)

resource.Test(t, resource.TestCase{
PreCheck: testPreCheck(t),
ProviderFactories: getTestProviderFactories(provider),
PreCheck: testhelper.TestPreCheck(t),
ProviderFactories: testhelper.GetTestProviderFactories(provider),
CheckDestroy: nil,
Steps: []resource.TestStep{
{
Expand Down
18 changes: 0 additions & 18 deletions internal/resources/namespace/namespace_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ SPDX-License-Identifier: MPL-2.0
package namespace

import (
"os"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand All @@ -16,8 +15,6 @@ import (
"github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/cluster"
)

const providerName = "tmc"

func initTestProvider(t *testing.T) *schema.Provider {
testProvider := &schema.Provider{
Schema: authctx.ProviderAuthSchema(),
Expand All @@ -37,18 +34,3 @@ func initTestProvider(t *testing.T) *schema.Provider {

return testProvider
}

func testPreCheck(t *testing.T) func() {
return func() {
for _, env := range []string{authctx.ServerEndpointEnvVar, authctx.VMWCloudAPITokenEnvVar, authctx.VMWCloudEndpointEnvVar} {
require.NotEmpty(t, os.Getenv(env))
}
}
}

func getTestProviderFactories(provider *schema.Provider) map[string]func() (*schema.Provider, error) {
//nolint:unparam
return map[string]func() (*schema.Provider, error){
providerName: func() (*schema.Provider, error) { return provider, nil },
}
}
4 changes: 2 additions & 2 deletions internal/resources/namespace/resource_namepace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ func TestAcceptanceForNamespaceResource(t *testing.T) {
clusterName := acctest.RandomWithPrefix("tf-cluster")

resource.Test(t, resource.TestCase{
PreCheck: testPreCheck(t),
ProviderFactories: getTestProviderFactories(provider),
PreCheck: testhelper.TestPreCheck(t),
ProviderFactories: testhelper.GetTestProviderFactories(provider),
CheckDestroy: nil,
Steps: []resource.TestStep{
{
Expand Down