From d6d54ed0bcf3b583fe681db790740cef137401d3 Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Sat, 8 Oct 2016 00:57:10 -0500
Subject: Replace the 'datastore' option with a 'database' option

The 'datastore' string option is deprecated and will be removed in a
future version. The new 'database' map option is preferred.
---
 server/store/store_test.go | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'server/store/store_test.go')

diff --git a/server/store/store_test.go b/server/store/store_test.go
index 594da37..dbe2d95 100644
--- a/server/store/store_test.go
+++ b/server/store/store_test.go
@@ -3,7 +3,6 @@ package store
 import (
 	"crypto/rand"
 	"crypto/rsa"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -16,6 +15,10 @@ import (
 	"golang.org/x/crypto/ssh"
 )
 
+var (
+	dbConfig = map[string]string{"username": "user", "password": "passwd", "address": "localhost"}
+)
+
 func TestParseCertificate(t *testing.T) {
 	t.Parallel()
 	a := assert.New(t)
@@ -87,11 +90,11 @@ func TestMemoryStore(t *testing.T) {
 
 func TestMySQLStore(t *testing.T) {
 	t.Parallel()
-	config := os.Getenv("MYSQL_TEST_CONFIG")
-	if config == "" {
-		t.Skip("No MYSQL_TEST_CONFIG environment variable")
+	if os.Getenv("MYSQL_TEST") == "" {
+		t.Skip("No MYSQL_TEST environment variable")
 	}
-	db, err := NewSQLStore(config)
+	dbConfig["type"] = "mysql"
+	db, err := NewSQLStore(dbConfig)
 	if err != nil {
 		t.Error(err)
 	}
@@ -100,11 +103,11 @@ func TestMySQLStore(t *testing.T) {
 
 func TestMongoStore(t *testing.T) {
 	t.Parallel()
-	config := os.Getenv("MONGO_TEST_CONFIG")
-	if config == "" {
-		t.Skip("No MONGO_TEST_CONFIG environment variable")
+	if os.Getenv("MONGO_TEST") == "" {
+		t.Skip("No MONGO_TEST environment variable")
 	}
-	db, err := NewMongoStore(config)
+	dbConfig["type"] = "mongo"
+	db, err := NewMongoStore(dbConfig)
 	if err != nil {
 		t.Error(err)
 	}
@@ -123,7 +126,8 @@ func TestSQLiteStore(t *testing.T) {
 	if err := exec.Command("go", args...).Run(); err != nil {
 		t.Error(err)
 	}
-	db, err := NewSQLStore(fmt.Sprintf("sqlite:%s", f.Name()))
+	config := map[string]string{"type": "sqlite", "filename": f.Name()}
+	db, err := NewSQLStore(config)
 	if err != nil {
 		t.Error(err)
 	}
-- 
cgit v1.2.3