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
commite89d12fc8ca64e9b39db524bc204af40dc2669e9 (patch)
tree34d0166ab0036d3019b5dab73f2dc0a7523f03cd /utils
parent5a8f8397167cec8cba29b70bb7dbdda9ba0265f7 (diff)
parent8789b111033924e7b17d01801d02fc3b387d203d (diff)
downloadchat-e89d12fc8ca64e9b39db524bc204af40dc2669e9.tar.gz
chat-e89d12fc8ca64e9b39db524bc204af40dc2669e9.tar.bz2
chat-e89d12fc8ca64e9b39db524bc204af40dc2669e9.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()
}
}
-*/