mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-31 02:28:09 +00:00 
			
		
		
		
	Merge multiple functions for creating consul containers into one. (#6612)
Merge both functions for creating mongodb containers into one. Add retries to docker container cleanups. Require $VAULT_ACC be set to enable AWS tests.
This commit is contained in:
		| @@ -2,15 +2,15 @@ package cassandra | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"fmt" | ||||
| 	"os" | ||||
| 	"strconv" | ||||
| 	"testing" | ||||
| 	"time" | ||||
|  | ||||
| 	"fmt" | ||||
|  | ||||
| 	"github.com/gocql/gocql" | ||||
| 	"github.com/hashicorp/errwrap" | ||||
| 	"github.com/hashicorp/vault/helper/testhelpers/docker" | ||||
| 	"github.com/hashicorp/vault/sdk/database/dbplugin" | ||||
| 	"github.com/ory/dockertest" | ||||
| ) | ||||
| @@ -40,10 +40,7 @@ func prepareCassandraTestContainer(t *testing.T) (func(), string, int) { | ||||
| 	} | ||||
|  | ||||
| 	cleanup := func() { | ||||
| 		err := pool.Purge(resource) | ||||
| 		if err != nil { | ||||
| 			t.Fatalf("Failed to cleanup local container: %s", err) | ||||
| 		} | ||||
| 		docker.CleanupResource(t, pool, resource) | ||||
| 	} | ||||
|  | ||||
| 	port, _ := strconv.Atoi(resource.GetPort("9042/tcp")) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 ncabatoff
					ncabatoff