diff --git a/.travis.yml b/.travis.yml index 9643758034..7222db7316 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false language: go go: - - 1.5 + - 1.6 # Need to ensure at least something remains in the install stanza to opt out of # Travis's built-in 'godep restore', which will fail Travis diff --git a/builtin/providers/chef/resource_role_test.go b/builtin/providers/chef/resource_role_test.go index 3859e4e858..e9eaaa7cd6 100644 --- a/builtin/providers/chef/resource_role_test.go +++ b/builtin/providers/chef/resource_role_test.go @@ -32,11 +32,12 @@ func TestAccRole_basic(t *testing.T) { return fmt.Errorf("wrong description; expected %v, got %v", expected, role.Description) } - expectedRunList := chefc.RunList{ + expectedRunListStrings := []string{ "recipe[terraform@1.0.0]", "recipe[consul]", "role[foo]", } + expectedRunList := chefc.RunList(expectedRunListStrings) if !reflect.DeepEqual(role.RunList, expectedRunList) { return fmt.Errorf("wrong runlist; expected %#v, got %#v", expectedRunList, role.RunList) } diff --git a/builtin/providers/google/resource_storage_bucket_acl_test.go b/builtin/providers/google/resource_storage_bucket_acl_test.go index a8b11e8f62..5ccce38dc0 100644 --- a/builtin/providers/google/resource_storage_bucket_acl_test.go +++ b/builtin/providers/google/resource_storage_bucket_acl_test.go @@ -7,7 +7,6 @@ import ( "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - //"google.golang.org/api/storage/v1" ) diff --git a/builtin/providers/google/resource_storage_object_acl_test.go b/builtin/providers/google/resource_storage_object_acl_test.go index 5cac86a14b..9833849382 100644 --- a/builtin/providers/google/resource_storage_object_acl_test.go +++ b/builtin/providers/google/resource_storage_object_acl_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - //"google.golang.org/api/storage/v1" )