[GH-21224] return error in plugin cmd (#26305)

server/cmd/mmctl/commands/plugin_test.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 
 	"github.com/golang/mock/gomock"
-	"github.com/hashicorp/go-multierror"
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 
@@ -86,7 +85,7 @@ func (s *MmctlUnitTestSuite) TestPluginAddCmd() {
 			Times(1)
 
 		err = pluginAddCmdF(s.client, &cobra.Command{}, []string{pluginName})
-		s.Require().NoError(err)
+		s.Require().ErrorContains(err, "plugin add error")
 		s.Require().Len(printer.GetErrorLines(), 1)
 		s.Require().Equal(printer.GetErrorLines()[0], "Unable to add plugin: "+pluginName+". Error: "+mockError.Error())
 	})
@@ -117,7 +116,7 @@ func (s *MmctlUnitTestSuite) TestPluginAddCmd() {
 		}
 
 		err := pluginAddCmdF(s.client, &cobra.Command{}, args)
-		s.Require().NoError(err)
+		s.Require().ErrorContains(err, "plugin add error")
 		s.Require().Len(printer.GetLines(), 1)
 		s.Require().Equal(printer.GetLines()[0], "Added plugin: "+args[1])
 		s.Require().Len(printer.GetErrorLines(), 2)
@@ -198,11 +197,8 @@ func (s *MmctlUnitTestSuite) TestPluginInstallUrlCmd() {
 			Return(nil, &model.Response{}, errors.New("mock error")).
 			Times(1)
 
-		var expected error
-		expected = multierror.Append(expected, errors.New("mock error"))
-
 		err := pluginInstallURLCmdF(s.client, &cobra.Command{}, args)
-		s.Require().EqualError(err, expected.Error())
+		s.Require().ErrorContains(err, "mock error")
 		s.Require().Len(printer.GetErrorLines(), 1)
 		s.Require().Equal("Unable to install plugin from URL \"https://example.com/plugin2.tar.gz\". Error: mock error", printer.GetErrorLines()[0])
 		s.Require().Len(printer.GetLines(), 1)
@@ -240,7 +236,7 @@ func (s *MmctlUnitTestSuite) TestPluginDisableCmd() {
 			Times(1)
 
 		err := pluginDisableCmdF(s.client, &cobra.Command{}, []string{arg})
-		s.Require().Nil(err)
+		s.Require().ErrorContains(err, "mock error")
 		s.Require().Len(printer.GetLines(), 0)
 		s.Require().Len(printer.GetErrorLines(), 1)
 		s.Require().Equal(printer.GetErrorLines()[0], "Unable to disable plugin: "+arg+". Error: "+mockError.Error())
@@ -268,7 +264,7 @@ func (s *MmctlUnitTestSuite) TestPluginDisableCmd() {
 		}
 
 		err := pluginDisableCmdF(s.client, &cobra.Command{}, args)
-		s.Require().Nil(err)
+		s.Require().ErrorContains(err, "mock error")
 		s.Require().Len(printer.GetLines(), 2)
 		s.Require().Equal(printer.GetLines()[0], "Disabled plugin: "+args[1])
 		s.Require().Equal(printer.GetLines()[1], "Disabled plugin: "+args[2])
@@ -329,7 +325,7 @@ func (s *MmctlUnitTestSuite) TestPluginEnableCmd() {
 			Times(1)
 
 		err := pluginEnableCmdF(s.client, &cobra.Command{}, []string{pluginArg})
-		s.Require().Nil(err)
+		s.Require().ErrorContains(err, "mock error")
 		s.Require().Len(printer.GetLines(), 0)
 		s.Require().Len(printer.GetErrorLines(), 1)
 		s.Require().Equal(printer.GetErrorLines()[0], "Unable to enable plugin: "+pluginArg+". Error: "+mockErr.Error())
@@ -361,7 +357,7 @@ func (s *MmctlUnitTestSuite) TestPluginEnableCmd() {
 		}
 
 		err := pluginEnableCmdF(s.client, &cobra.Command{}, allPlugins)
-		s.Require().Nil(err)
+		s.Require().ErrorContains(err, "mock error")
 		s.Require().Len(printer.GetLines(), 2)
 		s.Require().Equal(printer.GetLines()[0], "Enabled plugin: "+okPlugins[0])
 		s.Require().Equal(printer.GetLines()[1], "Enabled plugin: "+okPlugins[1])
@@ -533,6 +529,7 @@ func (s *MmctlUnitTestSuite) TestPluginListCmd() {
 
 		err := pluginListCmdF(s.client, &cobra.Command{}, nil)
 		s.Require().NotNil(err)
+		s.Require().Len(printer.GetLines(), 0)
 		s.Require().EqualError(err, "Unable to list plugins. Error: "+mockError.Error())
 	})
 }
@@ -550,7 +547,7 @@ func (s *MmctlUnitTestSuite) TestPluginDeleteCmd() {
 			Times(1)
 
 		err := pluginDeleteCmdF(s.client, &cobra.Command{}, []string{args})
-		s.Require().NoError(err)
+		s.Require().ErrorContains(err, "mock error")
 		s.Require().Len(printer.GetLines(), 0)
 		s.Require().Len(printer.GetErrorLines(), 1)
 		s.Require().Equal("Unable to delete plugin: "+args+". Error: "+mockError.Error(), printer.GetErrorLines()[0])
@@ -611,7 +608,7 @@ func (s *MmctlUnitTestSuite) TestPluginDeleteCmd() {
 			Times(1)
 
 		err := pluginDeleteCmdF(s.client, &cobra.Command{}, args)
-		s.Require().NoError(err)
+		s.Require().ErrorContains(err, "mock error")
 		s.Require().Len(printer.GetLines(), 2)
 		s.Require().Equal("Deleted plugin: "+args[0], printer.GetLines()[0])
 		s.Require().Equal("Deleted plugin: "+args[3], printer.GetLines()[1])