diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
| commit | 848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09 (patch) | |
| tree | 98390442e8052b8e02469e5ccf7596e22b7ea07f /utils/config_test.go | |
| parent | e87adce4a059b97a65198b326be6304abdf4e657 (diff) | |
| parent | bee26e3f2654ce7acce647818847480569236343 (diff) | |
| download | chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.gz chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.bz2 chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.zip | |
fixing merge conflicts
Diffstat (limited to 'utils/config_test.go')
| -rw-r--r-- | utils/config_test.go | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/utils/config_test.go b/utils/config_test.go index 9067dc647..4d37b4e88 100644 --- a/utils/config_test.go +++ b/utils/config_test.go @@ -4,24 +4,9 @@ package utils import ( - "os" "testing" ) func TestConfig(t *testing.T) { LoadConfig("config.json") } - -func TestEnvOverride(t *testing.T) { - os.Setenv("MATTERMOST_DOMAIN", "testdomain.com") - - LoadConfig("config_docker.json") - if Cfg.ServiceSettings.Domain != "testdomain.com" { - t.Fail() - } - - LoadConfig("config.json") - if Cfg.ServiceSettings.Domain == "testdomain.com" { - t.Fail() - } -} |