aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2018-04-30 14:18:47 +0300
committerTulir Asokan <tulir@maunium.net>2018-04-30 14:18:47 +0300
commita6b8c20b20fcf27643843cfef8516562a67c0b70 (patch)
treeee65fa9956b6ffdc622ba6ec63af21d8649f0f0f /config
parent8346f65e3dd707db8b294e6d2e3a9f95bcbfb54a (diff)
Fix config tests
Diffstat (limited to 'config')
-rw-r--r--config/config_test.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/config/config_test.go b/config/config_test.go
index 525a09d..ae7e725 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -26,14 +26,14 @@ import (
)
func TestNewConfig_Defaults(t *testing.T) {
- cfg := config.NewConfig("/tmp/gomuks-test-0")
+ cfg := config.NewConfig("/tmp/gomuks-test-0", "/tmp/gomuks-test-0")
assert.Equal(t, "/tmp/gomuks-test-0", cfg.Dir)
assert.Equal(t, "/tmp/gomuks-test-0/history", cfg.HistoryDir)
assert.Equal(t, "/tmp/gomuks-test-0/media", cfg.MediaDir)
}
func TestConfig_Load_NonexistentDoesntFail(t *testing.T) {
- cfg := config.NewConfig("/tmp/gomuks-test-1")
+ cfg := config.NewConfig("/tmp/gomuks-test-1", "/tmp/gomuks-test-1")
defer os.RemoveAll("/tmp/gomuks-test-1")
@@ -50,7 +50,7 @@ func TestConfig_Load_NonexistentDoesntFail(t *testing.T) {
func TestConfig_Load_DirectoryFails(t *testing.T) {
os.MkdirAll("/tmp/gomuks-test-2/config.yaml", 0700)
- cfg := config.NewConfig("/tmp/gomuks-test-2")
+ cfg := config.NewConfig("/tmp/gomuks-test-2", "/tmp/gomuks-test-2")
defer os.RemoveAll("/tmp/gomuks-test-2")
defer func() {
@@ -70,7 +70,7 @@ func TestConfig_Load_ExistingFileIsLoaded(t *testing.T) {
"history_dir": "/tmp/gomuks-test-3/foo",
"media_dir": "/tmp/gomuks-test-3/bar"
}`), 0700)
- cfg := config.NewConfig("/tmp/gomuks-test-3")
+ cfg := config.NewConfig("/tmp/gomuks-test-3", "/tmp/gomuks-test-3")
defer os.RemoveAll("/tmp/gomuks-test-3")
@@ -93,7 +93,7 @@ func TestConfig_Load_ExistingFileIsLoaded(t *testing.T) {
func TestConfig_Load_InvalidExistingFilePanics(t *testing.T) {
os.MkdirAll("/tmp/gomuks-test-4", 0700)
ioutil.WriteFile("/tmp/gomuks-test-4/config.yaml", []byte(`this is not JSON.`), 0700)
- cfg := config.NewConfig("/tmp/gomuks-test-4")
+ cfg := config.NewConfig("/tmp/gomuks-test-4", "/tmp/gomuks-test-4")
defer os.RemoveAll("/tmp/gomuks-test-4")
defer func() {
@@ -106,7 +106,7 @@ func TestConfig_Load_InvalidExistingFilePanics(t *testing.T) {
}
func TestConfig_Clear(t *testing.T) {
- cfg := config.NewConfig("/tmp/gomuks-test-5")
+ cfg := config.NewConfig("/tmp/gomuks-test-5", "/tmp/gomuks-test-5")
defer os.RemoveAll("/tmp/gomuks-test-5")
@@ -132,7 +132,7 @@ func TestConfig_Clear(t *testing.T) {
}
func TestConfig_Save(t *testing.T) {
- cfg := config.NewConfig("/tmp/gomuks-test-6")
+ cfg := config.NewConfig("/tmp/gomuks-test-6", "/tmp/gomuks-test-6")
defer os.RemoveAll("/tmp/gomuks-test-6")