mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

server: Fix typo in Makefile (#28710)

Просмотр исходного кода
Этот коммит содержится в:
Nicolas Le Cam
2024-10-14 10:32:43 +02:00
коммит произвёл GitHub
родитель abf60421b4
Коммит 845b5806c0
2 изменённых файлов: 5 добавлений и 5 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
server/Makefile
Просмотреть файл

@@ -457,7 +457,7 @@ test-server: export GOTESTSUM_FORMAT := $(GOTESTSUM_FORMAT)
test-server: export GOTESTSUM_JUNITFILE := $(GOTESTSUM_JUNITFILE) test-server: export GOTESTSUM_JUNITFILE := $(GOTESTSUM_JUNITFILE)
test-server: export GOTESTSUM_JSONFILE := $(GOTESTSUM_JSONFILE) test-server: export GOTESTSUM_JSONFILE := $(GOTESTSUM_JSONFILE)
test-server: test-server-pre 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 ($(IS_CI),true)
ifneq ($(MM_NO_DOCKER),true) ifneq ($(MM_NO_DOCKER),true)
ifneq ($(TEMP_DOCKER_SERVICES),) ifneq ($(TEMP_DOCKER_SERVICES),)

8
server/cmd/mmctl/commands/channel_test.go
Просмотреть файл

@@ -884,8 +884,8 @@ func (s *MmctlUnitTestSuite) TestListChannelsCmd() {
publicChannel2 := &model.Channel{Name: "publicChannelName2"} publicChannel2 := &model.Channel{Name: "publicChannelName2"}
publicChannels := []*model.Channel{publicChannel1, publicChannel2} publicChannels := []*model.Channel{publicChannel1, publicChannel2}
privateChannel1 := &model.Channel{Name: "archivedChannelName1"} privateChannel1 := &model.Channel{Name: "privateChannel1"}
privateChannel2 := &model.Channel{Name: "archivedChannelName2"} privateChannel2 := &model.Channel{Name: "privateChannel2"}
privateChannels := []*model.Channel{privateChannel1, privateChannel2} privateChannels := []*model.Channel{privateChannel1, privateChannel2}
userChannels := []*model.Channel{} userChannels := []*model.Channel{}
@@ -964,8 +964,8 @@ func (s *MmctlUnitTestSuite) TestListChannelsCmd() {
archivedChannel1 := &model.Channel{Name: "archivedChannelName1"} archivedChannel1 := &model.Channel{Name: "archivedChannelName1"}
publicChannel1 := &model.Channel{Name: "publicChannelName1"} publicChannel1 := &model.Channel{Name: "publicChannelName1"}
privateChannel1 := &model.Channel{Name: "archivedChannelName1", Type: model.ChannelTypePrivate} privateChannel1 := &model.Channel{Name: "privateChannel1", Type: model.ChannelTypePrivate}
privateChannel2 := &model.Channel{Name: "archivedChannelName2", Type: model.ChannelTypePrivate} privateChannel2 := &model.Channel{Name: "privateChannel2", Type: model.ChannelTypePrivate}
userChannels := []*model.Channel{archivedChannel1, publicChannel1, privateChannel1, privateChannel2} userChannels := []*model.Channel{archivedChannel1, publicChannel1, privateChannel1, privateChannel2}
mockError := errors.New("user does not have permissions to list all private channels in team") mockError := errors.New("user does not have permissions to list all private channels in team")