test harness cleanup

dynamodb/bucket_test.go

@@ -14,28 +14,35 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func setupTestTable(t *testing.T, table string, s *session.Session) {
-	ddb := dynamodb.New(s)
-	db := &bucketDB{
-		ddb:       ddb,
-		tableName: table,
+func testRequiredEnv(t *testing.T, key string) string {
+	val, ok := os.LookupEnv(key)
+	if !ok {
+		t.Logf("required test env var %s not set", key)
+		t.FailNow()
 	}
-	deleteTable(db)
-	err := createTable(db)
-	require.NoError(t, err)
+
+	return val
 }
 
-func getLocalStorage(t *testing.T) *Storage {
-	testTable := "test-table"
-	session, err := session.NewSession(&aws.Config{
+func testStorage(t *testing.T) *Storage {
+	table := "test-table"
+	s, err := session.NewSession(&aws.Config{
 		Region:      aws.String("doesntmatter"),
-		Endpoint:    aws.String(os.Getenv("AWS_DYNAMO_ENDPOINT")),
+		Endpoint:    aws.String(testRequiredEnv(t, "AWS_DYNAMO_ENDPOINT")),
 		Credentials: credentials.NewStaticCredentials("id", "secret", "token"),
 	})
+	ddb := dynamodb.New(s)
+	db := bucketDB{
+		ddb:       ddb,
+		tableName: table,
+	}
+	// ensure we're working with a clean table
+	deleteTable(db)
+	err = createTable(db)
 	require.NoError(t, err)
-	setupTestTable(t, testTable, session)
-	storage, err := New(testTable, session)
+	storage, err := New(table, s)
 	require.NoError(t, err)
+
 	return storage
 }
 
@@ -49,25 +56,25 @@ func TestNoTable(t *testing.T) {
 }
 
 func TestCreate(t *testing.T) {
-	test.CreateTest(getLocalStorage(t))(t)
+	test.CreateTest(testStorage(t))(t)
 }
 
 func TestAdd(t *testing.T) {
-	test.AddTest(getLocalStorage(t))(t)
+	test.AddTest(testStorage(t))(t)
 }
 
 func TestThreadSafeAdd(t *testing.T) {
-	test.ThreadSafeAddTest(getLocalStorage(t))(t)
+	test.ThreadSafeAddTest(testStorage(t))(t)
 }
 
 func TestReset(t *testing.T) {
-	test.AddResetTest(getLocalStorage(t))(t)
+	test.AddResetTest(testStorage(t))(t)
 }
 
 func TestFindOrCreate(t *testing.T) {
-	test.FindOrCreateTest(getLocalStorage(t))(t)
+	test.FindOrCreateTest(testStorage(t))(t)
 }
 
 func TestBucketInstanceConsistencyTest(t *testing.T) {
-	test.BucketInstanceConsistencyTest(getLocalStorage(t))(t)
+	test.BucketInstanceConsistencyTest(testStorage(t))(t)
 }

dynamodb/db_test.go

@@ -5,7 +5,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/dynamodb"
 )
 
-func createTable(db *bucketDB) error {
+func createTable(db bucketDB) error {
 	input := &dynamodb.CreateTableInput{
 		TableName:            aws.String(db.tableName),
 		BillingMode:          aws.String(dynamodb.BillingModePayPerRequest),
@@ -20,7 +20,7 @@ func createTable(db *bucketDB) error {
 	})
 }
 
-func deleteTable(db *bucketDB) error {
+func deleteTable(db bucketDB) error {
 	if _, err := db.ddb.DeleteTable(&dynamodb.DeleteTableInput{
 		TableName: aws.String(db.tableName),
 	}); err != nil {