Merge pull request #71 from hashicorp/travis-testacc-build-matrix

Travis CI: run acceptance tests; OS build matrix

Author: appilon

.travis.yml

@@ -1,10 +1,26 @@
-dist: trusty
-sudo: required
-services:
-- docker
 language: go
 go:
   - "1.11.x"
+jobs:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+      services:
+        - docker
+      script:
+        - make test
+        - make testacc
+        - make vet
+        - make website-test
+    - os: osx
+      script:
+        - make test
+        - make testacc
+    - os: windows
+      script:
+        # TODO: ensure windows setup can support binary testing
+        - TF_ACC=1 go test -v ./...
 env:
   - GO111MODULE=on GOFLAGS=-mod=vendor
 
@@ -15,15 +31,6 @@ install:
 # See: https://github.com/golang/go/issues/12933
 - bash scripts/gogetcookie.sh
 
-script:
-- make test
-- make vet
-- make website-test
-
 branches:
   only:
   - master
-matrix:
-  fast_finish: true
-  allow_failures:
-  - go: tip

archive/data_source_archive_file_test.go

@@ -3,6 +3,7 @@ package archive
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"regexp"
 	"testing"
 
@@ -58,6 +59,7 @@ func TestAccArchiveFile_Basic(t *testing.T) {
 					r.TestCheckResourceAttrPtr("data.archive_file.foo", "output_size", &fileSize),
 				),
 			},
+
 			{
 				Config: testAccArchiveFileMultiConfig,
 				Check: r.ComposeTestCheckFunc(
@@ -96,7 +98,7 @@ data "archive_file" "foo" {
 }
 `
 
-var tmpDir = os.TempDir() + "/test"
+var tmpDir = filepath.ToSlash(os.TempDir()) + "/test"
 var testAccArchiveFileOutputPath = fmt.Sprintf(`
 data "archive_file" "foo" {
   type                    = "zip"
@@ -133,10 +135,10 @@ data "archive_file" "foo" {
 
 var testAccArchiveFileMultiConfig = `
 data "archive_file" "foo" {
-  type        = "zip"
-  source {
-			filename = "content.txt"
-			content = "This is some content"
+	type = "zip"
+	source {
+		filename = "content.txt"
+		content = "This is some content"
 	}
 	output_path = "zip_file_acc_test.zip"
 }

archive/zip_archiver.go

@@ -90,6 +90,11 @@ func (a *ZipArchiver) ArchiveDir(indirname string, excludes []string) error {
 		return err
 	}
 
+	// ensure exclusions are OS compatible paths
+	for i := range excludes {
+		excludes[i] = filepath.FromSlash(excludes[i])
+	}
+
 	if err := a.open(); err != nil {
 		return err
 	}