Merge pull request #152 from maxlaverse/speed_up_some_tests

speed up some tests
maxlaverse · Aug 25, 2024 · 6dc6e27 · 6dc6e27
2 parents c4ff7e2 + c37e92e
commit 6dc6e27
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 49 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -97,7 +97,7 @@ jobs:
         run: go build -v ./...
 
       - name: Test
-        run: go test -coverprofile=profile.cov -v ./...
+        run: go test -failfast -coverprofile=profile.cov -v ./...
         env:
           VAULTWARDEN_HOST: "127.0.0.1"
           VAULTWARDEN_PORT: "8080"

diff --git a/internal/provider/data_source_attachment_test.go b/internal/provider/data_source_attachment_test.go
@@ -7,10 +7,10 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
-func TestAccDataSourceAttachmentAttributes(t *testing.T) {
+func TestAccDataSourceAttachment(t *testing.T) {
 	ensureVaultwardenConfigured(t)
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
@@ -22,16 +22,6 @@ func TestAccDataSourceAttachmentAttributes(t *testing.T) {
 					"data.bitwarden_attachment.foo_data", attributeAttachmentContent, regexp.MustCompile(`^Hello, I'm a text attachment$`),
 				),
 			},
-		},
-	})
-}
-
-func TestAccDataSourceAttachmentFailsOnInvalidConfiguration(t *testing.T) {
-	ensureVaultwardenConfigured(t)
-
-	resource.UnitTest(t, resource.TestCase{
-		ProviderFactories: providerFactories,
-		Steps: []resource.TestStep{
 			{
 				Config:      tfConfigProvider() + tfConfigResourceAttachment("fixtures/attachment1.txt") + tfConfigDataAttachmentInexistent(),
 				ExpectError: regexp.MustCompile("Error: attachment not found"),

diff --git a/internal/provider/data_source_folder_test.go b/internal/provider/data_source_folder_test.go
@@ -9,7 +9,7 @@ import (
 func TestAccDataSourceFolderAttributes(t *testing.T) {
 	ensureVaultwardenConfigured(t)
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/internal/provider/data_source_item_login_test.go b/internal/provider/data_source_item_login_test.go
@@ -11,7 +11,7 @@ import (
 func TestAccDataSourceItemLoginAttributes(t *testing.T) {
 	ensureVaultwardenConfigured(t)
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
@@ -21,16 +21,6 @@ func TestAccDataSourceItemLoginAttributes(t *testing.T) {
 				Config: tfConfigProvider() + tfConfigResourceItemLogin() + tfConfigDataItemLogin(),
 				Check:  checkItemLogin("data.bitwarden_item_login.foo_data"),
 			},
-		},
-	})
-}
-
-func TestAccDataSourceItemLoginFailsOnInexistentItem(t *testing.T) {
-	ensureVaultwardenConfigured(t)
-
-	resource.UnitTest(t, resource.TestCase{
-		ProviderFactories: providerFactories,
-		Steps: []resource.TestStep{
 			{
 				Config:      tfConfigProvider() + tfConfigInexistentDataItemLogin(),
 				ExpectError: regexp.MustCompile("Error: object not found"),
@@ -59,7 +49,7 @@ func TestAccDataSourceItemLoginFailsOnWrongResourceType(t *testing.T) {
 func TestAccDataSourceItemLoginBySearch(t *testing.T) {
 	ensureVaultwardenConfigured(t)
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
@@ -81,6 +71,10 @@ func TestAccDataSourceItemLoginBySearch(t *testing.T) {
 				Config:      tfConfigProvider() + tfConfigResourceItemLogin() + tfConfigDataItemLoginWithSearchAndOrg("missing-item"),
 				ExpectError: regexp.MustCompile("Error: no object found matching the filter"),
 			},
+			// Test: search for a secure note item with a login data source should fail
+			{
+				Config: tfConfigProvider(),
+			},
 			{
 				Config: tfConfigProvider() + tfConfigResourceItemSecureNote(),
 			},

diff --git a/internal/provider/data_source_item_secure_note_test.go b/internal/provider/data_source_item_secure_note_test.go
@@ -11,8 +11,9 @@ func TestAccDataSourceItemSecureNote(t *testing.T) {
 
 	resourceName := "data.bitwarden_item_secure_note.foo_data"
 
-	resource.UnitTest(t, resource.TestCase{
-		ProviderFactories: providerFactories,
+	resource.Test(t, resource.TestCase{
+		ProviderFactories:         providerFactories,
+		PreventPostDestroyRefresh: false,
 		Steps: []resource.TestStep{
 			{
 				Config: tfConfigProvider() + tfConfigResourceItemSecureNote(),

diff --git a/internal/provider/data_source_org_collection_test.go b/internal/provider/data_source_org_collection_test.go
@@ -8,17 +8,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
-func TestAccDataSourceOrgCollectionAttributes(t *testing.T) {
+func TestAccDataSourceOrgCollection(t *testing.T) {
 	ensureVaultwardenConfigured(t)
 
 	resourceName := "data.bitwarden_org_collection.foo_data"
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
-			{
-				Config: tfConfigProvider(),
-			},
 			{
 				Config: tfConfigProvider() + tfConfigDataOrgCollection(),
 				Check: resource.ComposeTestCheckFunc(

diff --git a/internal/provider/data_source_organization_test.go b/internal/provider/data_source_organization_test.go
@@ -13,12 +13,9 @@ func TestAccDataSourceOrganizationAttributes(t *testing.T) {
 
 	resourceName := "data.bitwarden_organization.foo_data"
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
-			{
-				Config: tfConfigProvider(),
-			},
 			{
 				Config: tfConfigProvider() + tfConfigDataOrganization(),
 				Check: resource.ComposeTestCheckFunc(

diff --git a/internal/provider/provider_auth_test.go b/internal/provider/provider_auth_test.go
@@ -23,7 +23,7 @@ func TestAccProviderAuthUsernamePassword(t *testing.T) {
 	invalidPassword := usernamePasswordTestProvider(testEmail, "incorrect-password")
 	invalidAccount := usernamePasswordTestProvider("[email protected]", testPassword)
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
@@ -53,7 +53,7 @@ func TestAccProviderAuthSessionKey(t *testing.T) {
 	validProvider := sessionKeyTestProvider(testEmail, bwTestClient(t).GetSessionKey())
 	invalidProvider := sessionKeyTestProvider(testEmail, "invalid-session-key")
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/internal/provider/provider_utils_test.go b/internal/provider/provider_utils_test.go
@@ -48,8 +48,6 @@ var isUserCreated bool
 var userMu sync.Mutex
 
 func init() {
-	testUniqueIdentifier = fmt.Sprintf("%02d%02d%02d", time.Now().Hour(), time.Now().Minute(), time.Now().Second())
-
 	host := os.Getenv("VAULTWARDEN_HOST")
 	port := os.Getenv("VAULTWARDEN_PORT")
 
@@ -59,7 +57,9 @@ func init() {
 	if len(port) == 0 {
 		port = "8080"
 	}
+
 	testServerURL = fmt.Sprintf("http://%s:%s/", host, port)
+	testUniqueIdentifier = fmt.Sprintf("%02d%02d%02d", time.Now().Hour(), time.Now().Minute(), time.Now().Second())
 }
 
 func ensureVaultwardenConfigured(t *testing.T) {
@@ -147,7 +147,7 @@ func createTestUserResources(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Log("Synced Bitwarden client")
+	t.Log("Synced test client")
 }
 
 func bwTestClient(t *testing.T) bw.Client {
@@ -176,23 +176,27 @@ func bwTestClient(t *testing.T) bw.Client {
 	if status.Status == bw.StatusUnauthenticated {
 
 		retries := 0
-		for retries < 3 {
+		for {
 			err = client.LoginWithPassword(context.Background(), testEmail, testPassword)
 			if err != nil {
 				// Retry if the user creation hasn't been fully taken into account yet
 				if retries < 3 {
 					retries++
-					time.Sleep(1 * time.Second)
+					t.Log("Account creation not taken into account yet, retrying...")
+					time.Sleep(time.Duration(retries) * time.Second)
 					continue
 				}
 				t.Fatal(err)
 			}
+			break
 		}
 	} else if status.Status == bw.StatusLocked {
 		err = client.Unlock(context.Background(), testPassword)
 		if err != nil {
 			t.Fatal(err)
 		}
+	} else {
+		t.Logf("Test client already logged-in: %s", status.Status)
 	}
 	return client
 }

diff --git a/internal/provider/resource_folder_test.go b/internal/provider/resource_folder_test.go
@@ -12,7 +12,7 @@ func TestAccResourceFolder(t *testing.T) {
 	resourceName := "bitwarden_folder.foo"
 	var objectID string
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/internal/provider/resource_item_login_test.go b/internal/provider/resource_item_login_test.go
@@ -17,7 +17,7 @@ func TestAccResourceItemLoginAttributes(t *testing.T) {
 	resourceName := "bitwarden_item_login.foo"
 	var objectID string
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
@@ -42,7 +42,7 @@ func TestAccMissingResourceItemLoginIsRecreated(t *testing.T) {
 
 	var objectID string
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/internal/provider/resource_item_secure_note_test.go b/internal/provider/resource_item_secure_note_test.go
@@ -13,7 +13,7 @@ func TestAccResourceItemSecureNote(t *testing.T) {
 	resourceName := "bitwarden_item_secure_note.foo"
 	var objectID string
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

diff --git a/internal/provider/resource_org_collection_test.go b/internal/provider/resource_org_collection_test.go
@@ -15,7 +15,7 @@ func TestAccResourceOrgCollection(t *testing.T) {
 	resourceName := "bitwarden_org_collection.foo_org_col"
 	var objectID string
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{