add proper timeout duration for s3bucket wait and add acceptance tests

issue: [hashicorp#877]

aws/resource_aws_s3_bucket.go

@@ -478,7 +478,7 @@ func resourceAwsS3BucketCreate(d *schema.ResourceData, meta interface{}) error {
 		if err != nil {
 			return fmt.Errorf("Error waiting for S3 Bucket creation: ", err)
 		}
-	case <-time.After(60):
+	case <-time.After(time.Duration(60) * time.Second):
 		return errors.New("S3 bucket creation timed out")
 	}
 	return resourceAwsS3BucketUpdate(d, meta)

aws/resource_aws_s3_bucket_test.go

@@ -1,8 +1,10 @@
 package aws
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
+	"html/template"
 	"reflect"
 	"regexp"
 	"strconv"
@@ -56,6 +58,26 @@ func TestAccAWSS3Bucket_basic(t *testing.T) {
 	})
 }
 
+func TestAccAWSS3Bucket_withTags(t *testing.T) {
+	for i := 0; i < 10; i++ {
+		rInt := acctest.RandInt()
+		resource.Test(t, resource.TestCase{
+			PreCheck: func() { testAccPreCheck(t) },
+			/*
+				IDRefreshName:   "aws_s3_bucket.bucket",
+				IDRefreshIgnore: []string{"force_destroy"},
+			*/
+			Providers:    testAccProviders,
+			CheckDestroy: testAccCheckAWSS3BucketDestroy,
+			Steps: []resource.TestStep{
+				{
+					Config: testAccAWSS3MultiBucketConfigWithTags(rInt),
+				},
+			},
+		})
+	}
+}
+
 func TestAccAWSS3Bucket_namePrefix(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -1174,6 +1196,74 @@ resource "aws_s3_bucket" "bucket" {
 `, randInt)
 }
 
+func testAccAWSS3MultiBucketConfigWithTags(randInt int) string {
+	t := template.Must(template.New("t1").
+		Parse(`
+resource "aws_s3_bucket" "bucket1" {
+	bucket = "tf-test-bucket-1-{{.GUID}}"
+	acl = "private"
+	force_destroy = true
+	tags {
+		Name = "tf-test-bucket-1-{{.GUID}}"
+		Environment = "{{.GUID}}"
+	}
+}
+
+resource "aws_s3_bucket" "bucket2" {
+	bucket = "tf-test-bucket-2-{{.GUID}}"
+	acl = "private"
+	force_destroy = true
+	tags {
+		Name = "tf-test-bucket-2-{{.GUID}}"
+		Environment = "{{.GUID}}"
+	}
+}
+
+resource "aws_s3_bucket" "bucket3" {
+	bucket = "tf-test-bucket-3-{{.GUID}}"
+	acl = "private"
+	force_destroy = true
+	tags {
+		Name = "tf-test-bucket-3-{{.GUID}}"
+		Environment = "{{.GUID}}"
+	}
+}
+
+resource "aws_s3_bucket" "bucket4" {
+	bucket = "tf-test-bucket-4-{{.GUID}}"
+	acl = "private"
+	force_destroy = true
+	tags {
+		Name = "tf-test-bucket-4-{{.GUID}}"
+		Environment = "{{.GUID}}"
+	}
+}
+
+resource "aws_s3_bucket" "bucket5" {
+	bucket = "tf-test-bucket-5-{{.GUID}}"
+	acl = "private"
+	force_destroy = true
+	tags {
+		Name = "tf-test-bucket-5-{{.GUID}}"
+		Environment = "{{.GUID}}"
+	}
+}
+
+resource "aws_s3_bucket" "bucket6" {
+	bucket = "tf-test-bucket-6-{{.GUID}}"
+	acl = "private"
+	force_destroy = true
+	tags {
+		Name = "tf-test-bucket-6-{{.GUID}}"
+		Environment = "{{.GUID}}"
+	}
+}
+`))
+	var doc bytes.Buffer
+	t.Execute(&doc, struct{ GUID int }{GUID: randInt})
+	return doc.String()
+}
+
 func testAccAWSS3BucketConfigWithRegion(randInt int) string {
 	return fmt.Sprintf(`
 provider "aws" {