Merge pull request #5177 from hashicorp/f-go-1.6

Update Travis to use Go 1.6
This commit is contained in:
James Nugent 2016-02-18 10:01:49 -08:00
commit 0d9a7a65ef
4 changed files with 3 additions and 4 deletions

View File

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

View File

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

View File

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

View File

@ -9,7 +9,6 @@ import (
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
//"google.golang.org/api/storage/v1"
)