diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
| commit | 5fa1b3581955761bd39c310bc88b1489d963a9fc (patch) | |
| tree | 25e6dd11592102807abebbb5de100f7d867005d8 /cmd | |
| parent | 37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493 (diff) | |
| parent | 87762ae62eb887dfb3fd0957040919aede46f7d4 (diff) | |
| download | chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.gz chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.bz2 chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/commands/config_flag_test.go | 6 | ||||
| -rw-r--r-- | cmd/commands/import.go | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/cmd/commands/config_flag_test.go b/cmd/commands/config_flag_test.go index 8d284ab73..7ea0d5153 100644 --- a/cmd/commands/config_flag_test.go +++ b/cmd/commands/config_flag_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" + "encoding/json" "github.com/mattermost/mattermost-server/cmd" "github.com/mattermost/mattermost-server/utils" ) @@ -26,6 +27,11 @@ func TestConfigFlag(t *testing.T) { configPath := filepath.Join(dir, "foo.json") require.NoError(t, ioutil.WriteFile(configPath, []byte(config.ToJson()), 0600)) + timezones := utils.LoadTimezones("timezones.json") + tzConfigPath := filepath.Join(dir, "timezones.json") + timezoneData, _ := json.Marshal(timezones) + require.NoError(t, ioutil.WriteFile(tzConfigPath, timezoneData, 0600)) + i18n, ok := utils.FindDir("i18n") require.True(t, ok) require.NoError(t, utils.CopyDir(i18n, filepath.Join(dir, "i18n"))) diff --git a/cmd/commands/import.go b/cmd/commands/import.go index 4058d175a..c572ec53a 100644 --- a/cmd/commands/import.go +++ b/cmd/commands/import.go @@ -130,6 +130,7 @@ func bulkImportCmdF(command *cobra.Command, args []string) error { if lineNumber != 0 { cmd.CommandPrettyPrintln(fmt.Sprintf("Error occurred on data file line %v", lineNumber)) } + return err } else { if apply { cmd.CommandPrettyPrintln("Finished Bulk Import.") |