summaryrefslogtreecommitdiffstats
path: root/utils/config_test.go
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 11:29:13 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 11:29:13 -0700
commitbf3ca45dac4b56d06394dd3ceb1cece61a10f1ae (patch)
tree0cf8da7c58b06c0482a7fc2e769f1e7555f53993 /utils/config_test.go
parent2a427254f4263b1d0b5f7c44268a0d34948971a7 (diff)
parentf99ad06c19379a9279af0c260d9daceefc7fe944 (diff)
downloadchat-bf3ca45dac4b56d06394dd3ceb1cece61a10f1ae.tar.gz
chat-bf3ca45dac4b56d06394dd3ceb1cece61a10f1ae.tar.bz2
chat-bf3ca45dac4b56d06394dd3ceb1cece61a10f1ae.zip
Merge pull request #6 from rgarmsen2295/master
Remerging
Diffstat (limited to 'utils/config_test.go')
-rw-r--r--utils/config_test.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/utils/config_test.go b/utils/config_test.go
index f6746f3ac..9067dc647 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -4,7 +4,7 @@
package utils
import (
- //"os"
+ "os"
"testing"
)
@@ -12,7 +12,6 @@ func TestConfig(t *testing.T) {
LoadConfig("config.json")
}
-/*
func TestEnvOverride(t *testing.T) {
os.Setenv("MATTERMOST_DOMAIN", "testdomain.com")
@@ -26,4 +25,3 @@ func TestEnvOverride(t *testing.T) {
t.Fail()
}
}
-*/