From f8939d92298d973ba1b80b850edc5b9b1d030e91 Mon Sep 17 00:00:00 2001
From: Brian Ketelsen <bketelsen@gmail.com>
Date: Sun, 26 Oct 2014 09:48:21 -0400
Subject: [PATCH] existing tests pass

---
 viper.go      |  2 +-
 viper_test.go | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/viper.go b/viper.go
index f0790b9..8882a73 100644
--- a/viper.go
+++ b/viper.go
@@ -519,7 +519,7 @@ func getRemoteConfig(provider *remoteProvider) (map[string]interface{}, error) {
 	case "etcd":
 		return getEtcdConfig(provider)
 	case "consul":
-		// do something
+		// not implemented yet
 
 	}
 	return config, nil
diff --git a/viper_test.go b/viper_test.go
index 9818138..941bbf9 100644
--- a/viper_test.go
+++ b/viper_test.go
@@ -65,7 +65,7 @@ func TestMarshalling(t *testing.T) {
 	SetConfigType("yaml")
 	r := bytes.NewReader(yamlExample)
 
-	MarshallReader(r)
+	MarshallReader(r, config)
 	assert.True(t, InConfig("name"))
 	assert.False(t, InConfig("state"))
 	assert.Equal(t, "steve", Get("name"))
@@ -106,7 +106,7 @@ func TestYML(t *testing.T) {
 	SetConfigType("yml")
 	r := bytes.NewReader(yamlExample)
 
-	MarshallReader(r)
+	MarshallReader(r, config)
 	assert.Equal(t, "steve", Get("name"))
 }
 
@@ -114,7 +114,7 @@ func TestJSON(t *testing.T) {
 	SetConfigType("json")
 	r := bytes.NewReader(jsonExample)
 
-	MarshallReader(r)
+	MarshallReader(r, config)
 	assert.Equal(t, "0001", Get("id"))
 }
 
@@ -122,14 +122,14 @@ func TestTOML(t *testing.T) {
 	SetConfigType("toml")
 	r := bytes.NewReader(tomlExample)
 
-	MarshallReader(r)
+	MarshallReader(r, config)
 	assert.Equal(t, "TOML Example", Get("title"))
 }
 
 func TestEnv(t *testing.T) {
 	SetConfigType("json")
 	r := bytes.NewReader(jsonExample)
-	MarshallReader(r)
+	MarshallReader(r, config)
 	BindEnv("id")
 	BindEnv("f", "FOOD")