Merge branch 'master' into advanced-permissions-phase-1

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")))

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.")