diff options
author | Daniel Schalla <daniel@schalla.me> | 2018-09-03 14:08:40 +0200 |
---|---|---|
committer | Jesús Espino <jespinog@gmail.com> | 2018-09-03 14:08:40 +0200 |
commit | 531897b1f0d8176c1f983f921f1d1de618db0131 (patch) | |
tree | 0f01811eee640141b6a1959ed64a7b250fd59d47 /cmd/mattermost | |
parent | 68fdaaa995555e93f067efc3a07f1866e43ae665 (diff) | |
download | chat-531897b1f0d8176c1f983f921f1d1de618db0131.tar.gz chat-531897b1f0d8176c1f983f921f1d1de618db0131.tar.bz2 chat-531897b1f0d8176c1f983f921f1d1de618db0131.zip |
add megacheck as makefile target (#9288)
Fix code issues in channel_test.go
Fix Channel Test Issues detected by Megacheck
Fix API Emoji Test Issues detected by Megacheck
Fixed API Issues Reported by Megacheck
Fixed App issues reported by megacheck
Remaining fixes
removed test added by mistake from old HEAD
gofmt
Store Fixes
simplified returns
Fix test for multi member channel delete
revert to delete unused function
Diffstat (limited to 'cmd/mattermost')
-rw-r--r-- | cmd/mattermost/commands/permissions.go | 6 | ||||
-rw-r--r-- | cmd/mattermost/commands/permissions_test.go | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cmd/mattermost/commands/permissions.go b/cmd/mattermost/commands/permissions.go index 9d9962ce5..01d933a98 100644 --- a/cmd/mattermost/commands/permissions.go +++ b/cmd/mattermost/commands/permissions.go @@ -124,9 +124,5 @@ func importPermissionsCmdF(command *cobra.Command, args []string) error { } defer file.Close() - if err := a.ImportPermissions(file); err != nil { - return err - } - - return nil + return a.ImportPermissions(file) } diff --git a/cmd/mattermost/commands/permissions_test.go b/cmd/mattermost/commands/permissions_test.go index eeaa17109..54ccbddb8 100644 --- a/cmd/mattermost/commands/permissions_test.go +++ b/cmd/mattermost/commands/permissions_test.go @@ -30,7 +30,7 @@ func permissionsLicenseRequiredTest(t *testing.T, subcommand string) { t.Fail() } args := []string{"-test.run", "ExecCommand", "--", "--disableconfigwatch", "permissions", subcommand} - output, err := exec.Command(path, args...).CombinedOutput() + output, _ := exec.Command(path, args...).CombinedOutput() actual := string(output) expected := utils.T("cli.license.critical") |