From 98b19262293b82b4355035f4a840a3055f44d68c Mon Sep 17 00:00:00 2001
From: "Israel Fruchter (ifruchte)" <ifruchte@cisco.com>
Date: Wed, 14 Mar 2018 01:28:40 +0200
Subject: [PATCH 1/2] Fixes for the test to run on windows

---
 client/client_test.go | 15 ++++++++++++---
 config/config_test.go |  9 ++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/client/client_test.go b/client/client_test.go
index 3f6e331..031e60d 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -210,7 +210,11 @@ func TestUpdateFeatures(t *testing.T) {
 	}`)
 
 	cfg := config.DefaultConfig()
-	cfg.Git.RepoPath = "/tmp"
+	dir, err := ioutil.TempDir("", "example")
+	if err != nil {
+		log.Fatal(err)
+	}
+	cfg.Git.RepoPath = dir
 	c, _ := New(cfg)
 	c.UpdateFeatures(raw)
 
@@ -235,14 +239,19 @@ func TestClient_UpdateFeatures_Failure(t *testing.T) {
 		},`)
 
 	cfg := config.DefaultConfig()
-	cfg.Git.RepoPath = "/tmp"
+	dir, err := ioutil.TempDir("", "example")
+	if err != nil {
+		log.Fatal(err)
+	}
+	cfg.Git.RepoPath = dir
 	c, _ := New(cfg)
 	c.UpdateFeatures(badUpdate)
 	assert.EqualValues(t, models.EmptyFeatureMap(), c.FeatureMap(), "Assert bad payload returns empty feature map")
 }
 
 func TestWatch(t *testing.T) {
-	p := "/tmp/decider.json"
+	tmpfile, err := ioutil.TempFile("", "example")
+	p := tmpfile.Name()
 	fm, err := models.NewFeatureMap(JSONBytes)
 	assert.NoError(t, err)
 	err = ioutil.WriteFile(p, JSONBytes, 0644)
diff --git a/config/config_test.go b/config/config_test.go
index 156f1ba..06c0cce 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -4,6 +4,8 @@ import (
 	"os/user"
 	"testing"
 
+	"io/ioutil"
+
 	"os"
 
 	"fmt"
@@ -41,7 +43,12 @@ func TestDefaultConfig(t *testing.T) {
 }
 
 func TestEnvOverride(t *testing.T) {
-	os.Setenv(envConfigDirOverride, "/tmp/dcdr")
+	dir, err := ioutil.TempDir("", "example")
+	assert.NoError(t, err)
+
+	defer os.RemoveAll(dir)
+
+	os.Setenv(envConfigDirOverride, dir)
 	cfg := LoadConfig()
 
 	assert.Equal(t, Path(), fmt.Sprintf("%s/%s", os.Getenv(envConfigDirOverride), configFileName))

From 2e2d5699e80f1074488b78f4c00c198280a8c8b3 Mon Sep 17 00:00:00 2001
From: "Israel Fruchter (ifruchte)" <ifruchte@cisco.com>
Date: Mon, 14 May 2018 23:30:53 +0300
Subject: [PATCH 2/2] Fix code-review comments

---
 client/client_test.go | 22 +++++++++++++---------
 config/config_test.go | 12 +++++++++---
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/client/client_test.go b/client/client_test.go
index 031e60d..f06e881 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -24,6 +24,14 @@ func NewTestClient() (c *Client) {
 	return
 }
 
+func TempDir(t *testing.T) string {
+	dir, err := ioutil.TempDir(os.TempDir(), "dcdr")
+	if err != nil {
+		t.Fatalf("ioutil.TempDir error: %s", err.Error())
+	}
+	return dir
+}
+
 var JSONBytes = []byte(`{
   "dcdr": {
     "features": {
@@ -210,10 +218,8 @@ func TestUpdateFeatures(t *testing.T) {
 	}`)
 
 	cfg := config.DefaultConfig()
-	dir, err := ioutil.TempDir("", "example")
-	if err != nil {
-		log.Fatal(err)
-	}
+	dir := TempDir(t)
+	defer os.RemoveAll(dir)
 	cfg.Git.RepoPath = dir
 	c, _ := New(cfg)
 	c.UpdateFeatures(raw)
@@ -239,10 +245,8 @@ func TestClient_UpdateFeatures_Failure(t *testing.T) {
 		},`)
 
 	cfg := config.DefaultConfig()
-	dir, err := ioutil.TempDir("", "example")
-	if err != nil {
-		log.Fatal(err)
-	}
+	dir := TempDir(t)
+	defer os.RemoveAll(dir)
 	cfg.Git.RepoPath = dir
 	c, _ := New(cfg)
 	c.UpdateFeatures(badUpdate)
@@ -250,7 +254,7 @@ func TestClient_UpdateFeatures_Failure(t *testing.T) {
 }
 
 func TestWatch(t *testing.T) {
-	tmpfile, err := ioutil.TempFile("", "example")
+	tmpfile, err := ioutil.TempFile(os.TempDir(), "dcdr.json")
 	p := tmpfile.Name()
 	fm, err := models.NewFeatureMap(JSONBytes)
 	assert.NoError(t, err)
diff --git a/config/config_test.go b/config/config_test.go
index 06c0cce..2cb7f71 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -13,6 +13,14 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func TempDir(t *testing.T) string {
+	dir, err := ioutil.TempDir(os.TempDir(), "dcdr")
+	if err != nil {
+		t.Fatalf("ioutil.TempDir error: %s", err.Error())
+	}
+	return dir
+}
+
 func TestDefaultConfig(t *testing.T) {
 	ConfigDir = "/tmp/does/not/exist"
 	cfg := LoadConfig()
@@ -43,9 +51,7 @@ func TestDefaultConfig(t *testing.T) {
 }
 
 func TestEnvOverride(t *testing.T) {
-	dir, err := ioutil.TempDir("", "example")
-	assert.NoError(t, err)
-
+	dir := TempDir(t)
 	defer os.RemoveAll(dir)
 
 	os.Setenv(envConfigDirOverride, dir)