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
commit45f166cc56ff6383d78062ce78ecb6782934416c (patch)
treeecde392adc71c0d72a99de34bbff91d10f4c6c6b /utils
parenta1c1ab4d00ff499def42c469eac9cf29f567bce6 (diff)
downloadchat-45f166cc56ff6383d78062ce78ecb6782934416c.tar.gz
chat-45f166cc56ff6383d78062ce78ecb6782934416c.tar.bz2
chat-45f166cc56ff6383d78062ce78ecb6782934416c.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()
}
}
-*/