summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-06-17 10:02:29 -0800
committerCorey Hulen <corey@hulen.com>2015-06-17 10:02:29 -0800
commit0ba5e0e4031492b1fe4b5f852e5a7e6bb601888c (patch)
treeecde392adc71c0d72a99de34bbff91d10f4c6c6b /utils
parenta1c1ab4d00ff499def42c469eac9cf29f567bce6 (diff)
parent45f166cc56ff6383d78062ce78ecb6782934416c (diff)
downloadchat-0ba5e0e4031492b1fe4b5f852e5a7e6bb601888c.tar.gz
chat-0ba5e0e4031492b1fe4b5f852e5a7e6bb601888c.tar.bz2
chat-0ba5e0e4031492b1fe4b5f852e5a7e6bb601888c.zip
Merge pull request #20 from mattermost/docker-tweaks
MM-1157 Various tweaks to docker requested. HELIUM
Diffstat (limited to 'utils')
-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()
}
}
-*/