summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-06-17 08:39:33 -0400
committerChristopher Speller <crspeller@gmail.com>2015-06-17 08:39:33 -0400
commitdec6c765f53744a6f9b265eaf3ecb56d9cef1331 (patch)
tree570c3083d3cf3bf74fc148089f319649c4617755 /utils
parente7772f5dff2f4ca24d484a10e7e6649c79098af9 (diff)
downloadchat-dec6c765f53744a6f9b265eaf3ecb56d9cef1331.tar.gz
chat-dec6c765f53744a6f9b265eaf3ecb56d9cef1331.tar.bz2
chat-dec6c765f53744a6f9b265eaf3ecb56d9cef1331.zip
Resurrecting config_docker.json. Moving docker related files to docker directory. Added copyright info.
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()
}
}
-*/