increase test wait to 1m, remove sleeps from tests, add prebuffering of test data

Author: jasdel

Makefile

@@ -58,17 +58,17 @@ build:
 
 unit-no-verify:
 	@echo "go test SDK and vendor packages"
-	go test -timeout 20s -v -count=1 -tags ${UNIT_TEST_TAGS} ${SDK_ALL_PKGS}
+	go test -timeout 1m -v -count=1 -tags ${UNIT_TEST_TAGS} ${SDK_ALL_PKGS}
 
 unit: verify build unit-no-verify
 
 unit-with-race-cover: verify build
 	@echo "go test SDK and vendor packages"
-	go test -timeout 20s -v -count=1 -tags ${UNIT_TEST_TAGS} -race -cpu=1,2,4 ${SDK_ALL_PKGS}
+	go test -timeout 1m -v -count=1 -tags ${UNIT_TEST_TAGS} -race -cpu=1,2,4 ${SDK_ALL_PKGS}
 
 unit-old-go-race-cover:
 	@echo "go test SDK only packages for old Go versions"
-	go test -timeout 20s -v -count=1 -race -cpu=1,2,4 ${SDK_COMPA_PKGS}
+	go test -timeout 1m -v -count=1 -race -cpu=1,2,4 ${SDK_COMPA_PKGS}
 
 ci-test: generate unit-with-race-cover ci-test-generate-validate
 

aws/credentials/credentials_test.go

@@ -2,6 +2,7 @@ package credentials
 
 import (
 	"math/rand"
+	"sync"
 	"testing"
 	"time"
 
@@ -107,17 +108,20 @@ func TestCredentialsIsExpired_Race(t *testing.T) {
 	creds := NewChainCredentials([]Provider{&MockProvider{}})
 
 	starter := make(chan struct{})
+	var wg sync.WaitGroup
+	wg.Add(10)
 	for i := 0; i < 10; i++ {
 		go func() {
+			defer wg.Done()
 			<-starter
-			for {
+			for i := 0; i < 100; i++ {
 				creds.IsExpired()
 			}
 		}()
 	}
 	close(starter)
 
-	time.Sleep(10 * time.Second)
+	wg.Wait()
 }
 
 func TestCredentialsExpiresAt_NoExpirer(t *testing.T) {

awstesting/unit/unit.go

@@ -2,12 +2,16 @@
 package unit
 
 import (
+	"time"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 )
 
 // Session is a shared session for unit tests to use.
-var Session = session.Must(session.NewSession(aws.NewConfig().
-	WithCredentials(credentials.NewStaticCredentials("AKID", "SECRET", "SESSION")).
-	WithRegion("mock-region")))
+var Session = session.Must(session.NewSession(&aws.Config{
+	Credentials: credentials.NewStaticCredentials("AKID", "SECRET", "SESSION"),
+	Region:      aws.String("mock-region"),
+	SleepDelay:  func(time.Duration) {},
+}))

service/s3/s3manager/download_test.go

@@ -88,7 +88,7 @@ func dlLoggingSvcNoChunk(data []byte) (*s3.S3, *[]string) {
 func dlLoggingSvcNoContentRangeLength(data []byte, states []int) (*s3.S3, *[]string) {
 	var m sync.Mutex
 	names := []string{}
-	var index int = 0
+	var index int
 
 	svc := s3.New(unit.Session)
 	svc.Handlers.Send.Clear()
@@ -113,7 +113,7 @@ func dlLoggingSvcContentRangeTotalAny(data []byte, states []int) (*s3.S3, *[]str
 	var m sync.Mutex
 	names := []string{}
 	ranges := []string{}
-	var index int = 0
+	var index int
 
 	svc := s3.New(unit.Session)
 	svc.Handlers.Send.Clear()
@@ -159,7 +159,7 @@ func dlLoggingSvcContentRangeTotalAny(data []byte, states []int) (*s3.S3, *[]str
 func dlLoggingSvcWithErrReader(cases []testErrReader) (*s3.S3, *[]string) {
 	var m sync.Mutex
 	names := []string{}
-	var index int = 0
+	var index int
 
 	svc := s3.New(unit.Session, &aws.Config{
 		MaxRetries: aws.Int(len(cases) - 1),
@@ -193,7 +193,8 @@ func TestDownloadOrder(t *testing.T) {
 	d := s3manager.NewDownloaderWithClient(s, func(d *s3manager.Downloader) {
 		d.Concurrency = 1
 	})
-	w := &aws.WriteAtBuffer{}
+
+	w := aws.NewWriteAtBuffer(make([]byte, len(buf12MB)))
 	n, err := d.Download(w, &s3.GetObjectInput{
 		Bucket: aws.String("bucket"),
 		Key:    aws.String("key"),
@@ -215,14 +216,6 @@ func TestDownloadOrder(t *testing.T) {
 	if e, a := expectRngs, *ranges; !reflect.DeepEqual(e, a) {
 		t.Errorf("expect %v ranges, got %v", e, a)
 	}
-
-	count := 0
-	for _, b := range w.Bytes() {
-		count += int(b)
-	}
-	if count != 0 {
-		t.Errorf("expect 0 count, got %d", count)
-	}
 }
 
 func TestDownloadZero(t *testing.T) {