From 2af30fb441ff7e64789eeaec984334749daeeddc Mon Sep 17 00:00:00 2001
From: Mahmood Ali <mahmood@hashicorp.com>
Date: Wed, 20 Feb 2019 07:41:47 -0500
Subject: [PATCH] tests: expect Docker on AppVeyor

Prepare to run docker on AppVeyor Windows environment
---
 client/testutil/docker.go |  4 ++++
 testutil/wait.go          | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/client/testutil/docker.go b/client/testutil/docker.go
index 441c61ef1..92bc72fb0 100644
--- a/client/testutil/docker.go
+++ b/client/testutil/docker.go
@@ -16,6 +16,10 @@ func DockerIsConnected(t *testing.T) bool {
 		return runtime.GOOS == "linux"
 	}
 
+	if testutil.IsAppVeyor() {
+		return runtime.GOOS == "windows"
+	}
+
 	client, err := docker.NewClientFromEnv()
 	if err != nil {
 		return false
diff --git a/testutil/wait.go b/testutil/wait.go
index c5bbf439c..f77847323 100644
--- a/testutil/wait.go
+++ b/testutil/wait.go
@@ -10,12 +10,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-const (
-	// TravisRunEnv is an environment variable that is set if being run by
-	// Travis.
-	TravisRunEnv = "CI"
-)
-
 type testFn func() (bool, error)
 type errorFn func(error)
 
@@ -69,8 +63,18 @@ func Timeout(original time.Duration) time.Duration {
 	return original * time.Duration(TestMultiplier())
 }
 
+func IsCI() bool {
+	_, ok := os.LookupEnv("CI")
+	return ok
+}
+
 func IsTravis() bool {
-	_, ok := os.LookupEnv(TravisRunEnv)
+	_, ok := os.LookupEnv("TRAVIS")
+	return ok
+}
+
+func IsAppVeyor() bool {
+	_, ok := os.LookupEnv("APPVEYOR")
 	return ok
 }