IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

update remote state tests to use new test helpers

Browse Source
This commit is contained in:
James Bardin 2018-02-20 21:05:58 -05:00
parent 112c37458f
commit 57cbcbe99d
7 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/remote-state/azure/backend_test.go
View File

@ -64,7 +64,7 @@ func TestBackend(t *testing.T) {
"access_key": res.accessKey, "access_key": res.accessKey,
}).(*Backend) }).(*Backend)
backend.TestBackend(t, b, nil) backend.TestBackendStates(t, b)
} }
func TestBackendLocked(t *testing.T) { func TestBackendLocked(t *testing.T) {
@ -88,7 +88,8 @@ func TestBackendLocked(t *testing.T) {
"access_key": res.accessKey, "access_key": res.accessKey,
}).(*Backend) }).(*Backend)
backend.TestBackend(t, b1, b2) backend.TestBackendStateLocks(t, b1, b2)
backend.TestBackendStateForceUnlock(t, b1, b2)
} }
type testResources struct { type testResources struct {

8
backend/remote-state/consul/backend_test.go
View File

@ -63,7 +63,8 @@ func TestBackend(t *testing.T) {
}) })
// Test // Test
backend.TestBackend(t, b1, b2) backend.TestBackendStates(t, b1)
backend.TestBackendStateLocks(t, b1, b2)
} }
func TestBackend_lockDisabled(t *testing.T) { func TestBackend_lockDisabled(t *testing.T) {
@ -83,7 +84,8 @@ func TestBackend_lockDisabled(t *testing.T) {
}) })
// Test // Test
backend.TestBackend(t, b1, b2) backend.TestBackendStates(t, b1)
backend.TestBackendStateLocks(t, b1, b2)
} }
func TestBackend_gzip(t *testing.T) { func TestBackend_gzip(t *testing.T) {
@ -95,5 +97,5 @@ func TestBackend_gzip(t *testing.T) {
}) })
// Test // Test
backend.TestBackend(t, b, nil) backend.TestBackendStates(t, b)
} }

6
backend/remote-state/etcdv3/backend_test.go
View File

@ -66,7 +66,9 @@ func TestBackend(t *testing.T) {
}) })
// Test // Test
backend.TestBackend(t, b1, b2) backend.TestBackendStates(t, b1)
backend.TestBackendStateLocks(t, b1, b2)
backend.TestBackendStateForceUnlock(t, b1, b2)
} }
func TestBackend_lockDisabled(t *testing.T) { func TestBackend_lockDisabled(t *testing.T) {
@ -89,5 +91,5 @@ func TestBackend_lockDisabled(t *testing.T) {
}) })
// Test // Test
backend.TestBackend(t, b1, b2) backend.TestBackendStateLocks(t, b1, b2)
} }

4
backend/remote-state/inmem/backend_test.go
View File

@ -40,7 +40,7 @@ func TestBackendConfig(t *testing.T) {
func TestBackend(t *testing.T) { func TestBackend(t *testing.T) {
defer Reset() defer Reset()
b := backend.TestBackendConfig(t, New(), nil).(*Backend) b := backend.TestBackendConfig(t, New(), nil).(*Backend)
backend.TestBackend(t, b, nil) backend.TestBackendStates(t, b)
} }
func TestBackendLocked(t *testing.T) { func TestBackendLocked(t *testing.T) {
@ -48,7 +48,7 @@ func TestBackendLocked(t *testing.T) {
b1 := backend.TestBackendConfig(t, New(), nil).(*Backend) b1 := backend.TestBackendConfig(t, New(), nil).(*Backend)
b2 := backend.TestBackendConfig(t, New(), nil).(*Backend) b2 := backend.TestBackendConfig(t, New(), nil).(*Backend)
backend.TestBackend(t, b1, b2) backend.TestBackendStateLocks(t, b1, b2)
} }
// use the this backen to test the remote.State implementation // use the this backen to test the remote.State implementation

5
backend/remote-state/manta/backend_test.go
View File

@ -38,7 +38,7 @@ func TestBackend(t *testing.T) {
createMantaFolder(t, b.storageClient, directory) createMantaFolder(t, b.storageClient, directory)
defer deleteMantaFolder(t, b.storageClient, directory) defer deleteMantaFolder(t, b.storageClient, directory)
backend.TestBackend(t, b, nil) backend.TestBackendStates(t, b)
} }
func TestBackendLocked(t *testing.T) { func TestBackendLocked(t *testing.T) {
@ -60,7 +60,8 @@ func TestBackendLocked(t *testing.T) {
createMantaFolder(t, b1.storageClient, directory) createMantaFolder(t, b1.storageClient, directory)
defer deleteMantaFolder(t, b1.storageClient, directory) defer deleteMantaFolder(t, b1.storageClient, directory)
backend.TestBackend(t, b1, b2) backend.TestBackendStateLocks(t, b1, b2)
backend.TestBackendStateForceUnlock(t, b1, b2)
} }
func createMantaFolder(t *testing.T, mantaClient *storage.StorageClient, directoryName string) { func createMantaFolder(t *testing.T, mantaClient *storage.StorageClient, directoryName string) {

11
backend/remote-state/s3/backend_test.go
View File

@ -103,7 +103,7 @@ func TestBackend(t *testing.T) {
createS3Bucket(t, b.s3Client, bucketName) createS3Bucket(t, b.s3Client, bucketName)
defer deleteS3Bucket(t, b.s3Client, bucketName) defer deleteS3Bucket(t, b.s3Client, bucketName)
backend.TestBackend(t, b, nil) backend.TestBackendStates(t, b)
} }
func TestBackendLocked(t *testing.T) { func TestBackendLocked(t *testing.T) {
@ -131,7 +131,8 @@ func TestBackendLocked(t *testing.T) {
createDynamoDBTable(t, b1.dynClient, bucketName) createDynamoDBTable(t, b1.dynClient, bucketName)
defer deleteDynamoDBTable(t, b1.dynClient, bucketName) defer deleteDynamoDBTable(t, b1.dynClient, bucketName)
backend.TestBackend(t, b1, b2) backend.TestBackendStateLocks(t, b1, b2)
backend.TestBackendStateForceUnlock(t, b1, b2)
} }
// add some extra junk in S3 to try and confuse the env listing. // add some extra junk in S3 to try and confuse the env listing.
@ -334,9 +335,9 @@ func TestKeyEnv(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
backend.TestBackend(t, b0, nil) backend.TestBackendStates(t, b0)
backend.TestBackend(t, b1, nil) backend.TestBackendStates(t, b1)
backend.TestBackend(t, b2, nil) backend.TestBackendStates(t, b2)
} }
func testGetWorkspaceForKey(b *Backend, key string, expected string) error { func testGetWorkspaceForKey(b *Backend, key string, expected string) error {

2
backend/remote-state/swift/backend_test.go
View File

@ -67,7 +67,7 @@ func TestBackend(t *testing.T) {
defer deleteSwiftContainer(t, b.client, container) defer deleteSwiftContainer(t, b.client, container)
backend.TestBackend(t, b, nil) backend.TestBackendStates(t, b)
} }
func TestBackendPath(t *testing.T) { func TestBackendPath(t *testing.T) {