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:
ncabatoff
2019-04-22 12:26:10 -04:00
committed by GitHub
parent e0c71cb282
commit 0f1569b7f5
28 changed files with 295 additions and 441 deletions

View File

@@ -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"))