diff --git a/cmd/juju/model/mocks/showcommit_mock.go b/cmd/juju/model/mocks/showcommit_mock.go index 063dce67828..293b5b31666 100644 --- a/cmd/juju/model/mocks/showcommit_mock.go +++ b/cmd/juju/model/mocks/showcommit_mock.go @@ -49,16 +49,16 @@ func (mr *MockShowCommitCommandAPIMockRecorder) Close() *gomock.Call { } // ShowCommit mocks base method -func (m *MockShowCommitCommandAPI) ShowCommit(arg0 func(time.Time) string) (model.GenerationCommit, error) { +func (m *MockShowCommitCommandAPI) ShowCommit(arg0 func(time.Time) string, arg1 int) (model.GenerationCommit, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ShowCommit", arg0) + ret := m.ctrl.Call(m, "ShowCommit", arg0, arg1) ret0, _ := ret[0].(model.GenerationCommit) ret1, _ := ret[1].(error) return ret0, ret1 } // ShowCommit indicates an expected call of ShowCommit -func (mr *MockShowCommitCommandAPIMockRecorder) ShowCommit(arg0 interface{}) *gomock.Call { +func (mr *MockShowCommitCommandAPIMockRecorder) ShowCommit(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShowCommit", reflect.TypeOf((*MockShowCommitCommandAPI)(nil).ShowCommit), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShowCommit", reflect.TypeOf((*MockShowCommitCommandAPI)(nil).ShowCommit), arg0, arg1) } diff --git a/cmd/juju/model/showcommit_test.go b/cmd/juju/model/showcommit_test.go index c9fdc66fc14..431d8c52add 100644 --- a/cmd/juju/model/showcommit_test.go +++ b/cmd/juju/model/showcommit_test.go @@ -4,7 +4,6 @@ package model_test import ( - "fmt" "github.com/golang/mock/gomock" "github.com/juju/cmd" "github.com/juju/cmd/cmdtesting" @@ -101,11 +100,10 @@ func (s *showCommitsSuite) TestRunCommandJsonOutput(c *gc.C) { } `, "") expected = expected + "\n" - s.api.EXPECT().ShowCommit(gomock.Any()).Return(result, nil) + s.api.EXPECT().ShowCommit(gomock.Any(), 1).Return(result, nil) ctx, err := s.runCommand(c, "1", "--format=json") c.Assert(err, jc.ErrorIsNil) output := cmdtesting.Stdout(ctx) - fmt.Println(output) c.Assert(output, gc.Equals, expected) } @@ -130,8 +128,7 @@ committed-by: test-user created: 0001-01-00 created-by: test-user `[1:] - s.api.EXPECT().ShowCommit(gomock.Any()).Return(result, nil) - + s.api.EXPECT().ShowCommit(gomock.Any(), 1).Return(result, nil) ctx, err := s.runCommand(c, "1", "--format=yaml") c.Assert(err, jc.ErrorIsNil) c.Assert(cmdtesting.Stdout(ctx), gc.Matches, expected) @@ -140,7 +137,7 @@ created-by: test-user func (s *showCommitsSuite) TestRunCommandAPIError(c *gc.C) { defer s.setup(c).Finish() - s.api.EXPECT().ShowCommit(gomock.Any()).Return(nil, errors.New("boom")) + s.api.EXPECT().ShowCommit(gomock.Any(), gomock.Any()).Return(nil, errors.New("boom")) _, err := s.runCommand(c) c.Assert(err, gc.ErrorMatches, "boom")