Skip to content

Commit

Permalink
server: Fix typo in Makefile (mattermost#28710)
Browse files Browse the repository at this point in the history
  • Loading branch information
KuSh authored Oct 14, 2024
1 parent abf6042 commit 845b580
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ test-server: export GOTESTSUM_FORMAT := $(GOTESTSUM_FORMAT)
test-server: export GOTESTSUM_JUNITFILE := $(GOTESTSUM_JUNITFILE)
test-server: export GOTESTSUM_JSONFILE := $(GOTESTSUM_JSONFILE)
test-server: test-server-pre
$(GOBIN)/gotestsum --rerun-fails=3 --packages="$(TE_PACKAGES) $(EE_PACKAGES)" -- $(GOFLAGS)-timeout=90m
$(GOBIN)/gotestsum --rerun-fails=3 --packages="$(TE_PACKAGES) $(EE_PACKAGES)" -- $(GOFLAGS) -timeout=90m
ifneq ($(IS_CI),true)
ifneq ($(MM_NO_DOCKER),true)
ifneq ($(TEMP_DOCKER_SERVICES),)
Expand Down
8 changes: 4 additions & 4 deletions server/cmd/mmctl/commands/channel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -884,8 +884,8 @@ func (s *MmctlUnitTestSuite) TestListChannelsCmd() {
publicChannel2 := &model.Channel{Name: "publicChannelName2"}
publicChannels := []*model.Channel{publicChannel1, publicChannel2}

privateChannel1 := &model.Channel{Name: "archivedChannelName1"}
privateChannel2 := &model.Channel{Name: "archivedChannelName2"}
privateChannel1 := &model.Channel{Name: "privateChannel1"}
privateChannel2 := &model.Channel{Name: "privateChannel2"}
privateChannels := []*model.Channel{privateChannel1, privateChannel2}
userChannels := []*model.Channel{}

Expand Down Expand Up @@ -964,8 +964,8 @@ func (s *MmctlUnitTestSuite) TestListChannelsCmd() {
archivedChannel1 := &model.Channel{Name: "archivedChannelName1"}
publicChannel1 := &model.Channel{Name: "publicChannelName1"}

privateChannel1 := &model.Channel{Name: "archivedChannelName1", Type: model.ChannelTypePrivate}
privateChannel2 := &model.Channel{Name: "archivedChannelName2", Type: model.ChannelTypePrivate}
privateChannel1 := &model.Channel{Name: "privateChannel1", Type: model.ChannelTypePrivate}
privateChannel2 := &model.Channel{Name: "privateChannel2", Type: model.ChannelTypePrivate}
userChannels := []*model.Channel{archivedChannel1, publicChannel1, privateChannel1, privateChannel2}

mockError := errors.New("user does not have permissions to list all private channels in team")
Expand Down

0 comments on commit 845b580

Please sign in to comment.