Use gatedio in tests to avoid race conditions

thalesfsp · Oct 13, 2015 · c2a1a65 · c2a1a65
1 parent a647df4
commit c2a1a65
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/cli_test.go b/cli_test.go
@@ -1,14 +1,14 @@
 package main
 
 import (
-	"bytes"
 	"io/ioutil"
 	"reflect"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/hashicorp/consul-template/watch"
+	"github.com/hashicorp/go-gatedio"
 )
 
 func TestParseFlags_consul(t *testing.T) {
@@ -526,7 +526,7 @@ func TestParseFlags_errors(t *testing.T) {
 }
 
 func TestRun_errors(t *testing.T) {
-	buf := new(bytes.Buffer)
+	buf := gatedio.NewByteBuffer()
 
 	// Returns the right exit code if no command is given
 	cli := NewCLI(ioutil.Discard, buf)

diff --git a/runner_test.go b/runner_test.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -15,6 +14,7 @@ import (
 	"github.com/hashicorp/consul-template/test"
 	"github.com/hashicorp/consul-template/watch"
 	"github.com/hashicorp/consul/testutil"
+	"github.com/hashicorp/go-gatedio"
 	vaultapi "github.com/hashicorp/vault/api"
 	"github.com/hashicorp/vault/http"
 	"github.com/hashicorp/vault/logical"
@@ -119,7 +119,7 @@ func TestRun_consul(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
+	outStream, errStream := gatedio.NewByteBuffer(), gatedio.NewByteBuffer()
 	runner.outStream, runner.errStream = outStream, errStream
 
 	go runner.Start()
@@ -192,7 +192,7 @@ func TestRun_vault(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
+	outStream, errStream := gatedio.NewByteBuffer(), gatedio.NewByteBuffer()
 	runner.outStream, runner.errStream = outStream, errStream
 
 	go runner.Start()
@@ -286,7 +286,7 @@ func TestRun_vaultPrecedenceOverConsul(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
+	outStream, errStream := gatedio.NewByteBuffer(), gatedio.NewByteBuffer()
 	runner.outStream, runner.errStream = outStream, errStream
 
 	go runner.Start()
@@ -334,7 +334,7 @@ func TestRun_format(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
+	outStream, errStream := gatedio.NewByteBuffer(), gatedio.NewByteBuffer()
 	runner.outStream, runner.errStream = outStream, errStream
 
 	go runner.Start()
@@ -375,7 +375,7 @@ func TestRun_sanitize(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
+	outStream, errStream := gatedio.NewByteBuffer(), gatedio.NewByteBuffer()
 	runner.outStream, runner.errStream = outStream, errStream
 
 	go runner.Start()
@@ -416,7 +416,7 @@ func TestRun_upcase(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
+	outStream, errStream := gatedio.NewByteBuffer(), gatedio.NewByteBuffer()
 	runner.outStream, runner.errStream = outStream, errStream
 
 	go runner.Start()
@@ -457,7 +457,7 @@ func TestRun_pristine(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
+	outStream, errStream := gatedio.NewByteBuffer(), gatedio.NewByteBuffer()
 	runner.outStream, runner.errStream = outStream, errStream
 
 	go runner.Start()
@@ -510,7 +510,7 @@ func TestRun_merges(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
+	outStream, errStream := gatedio.NewByteBuffer(), gatedio.NewByteBuffer()
 	runner.outStream, runner.errStream = outStream, errStream
 
 	go runner.Start()
@@ -544,7 +544,7 @@ func TestStart_noRunMissingData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
+	outStream, errStream := gatedio.NewByteBuffer(), gatedio.NewByteBuffer()
 	runner.outStream, runner.errStream = outStream, errStream
 
 	go runner.Start()