From f04bfc498bced76485f8c164f9969e0ed9de7519 Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Sat, 28 May 2016 20:11:10 +0100
Subject: [PATCH] Fix tests

---
 cmd/cashier/client_test.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/cmd/cashier/client_test.go b/cmd/cashier/client_test.go
index 492f4fc7..426128c4 100644
--- a/cmd/cashier/client_test.go
+++ b/cmd/cashier/client_test.go
@@ -58,8 +58,7 @@ func TestSignGood(t *testing.T) {
 		fmt.Fprintln(w, string(j))
 	}))
 	defer ts.Close()
-	*ca = ts.URL
-	_, err := send([]byte(`{}`), "token")
+	_, err := send([]byte(`{}`), "token", ts.URL)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -67,7 +66,11 @@ func TestSignGood(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	cert, err := sign(k, "token")
+	c := &config{
+		CA:       ts.URL,
+		Validity: "24h",
+	}
+	cert, err := sign(k, "token", c)
 	if cert == nil && err != nil {
 		t.Fatal(err)
 	}
@@ -83,8 +86,7 @@ func TestSignBad(t *testing.T) {
 		fmt.Fprintln(w, string(j))
 	}))
 	defer ts.Close()
-	*ca = ts.URL
-	_, err := send([]byte(`{}`), "token")
+	_, err := send([]byte(`{}`), "token", ts.URL)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -92,7 +94,11 @@ func TestSignBad(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	cert, err := sign(k, "token")
+	c := &config{
+		CA:       ts.URL,
+		Validity: "24h",
+	}
+	cert, err := sign(k, "token", c)
 	if cert != nil && err == nil {
 		t.Fatal(err)
 	}
-- 
GitLab