Fix for test-data make target (#18229)

* Fix for the test-data command.

* Sleep and warn about needing local mode enabled.

* Improved server start synchro.
This commit is contained in:
Martin Kraft 2021-08-23 09:45:07 -04:00 committed by GitHub
parent ddaa07e35f
commit 77dc29308f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 3 deletions

View file

@ -425,9 +425,15 @@ cover: ## Runs the golang coverage tool. You must run the unit tests first.
$(GO) tool cover -html=cover.out
$(GO) tool cover -html=ecover.out
test-data: start-docker ## Add test data to the local instance.
$(GO) run $(GOFLAGS) -ldflags '$(LDFLAGS)' $(PLATFORM_FILES) config set TeamSettings.MaxUsersPerTeam 100
$(GO) run $(GOFLAGS) -ldflags '$(LDFLAGS)' $(PLATFORM_FILES) sampledata -w 4 -u 60
test-data: run-server ## Add test data to the local instance.
@if ! ./scripts/wait-for-system-start.sh; then \
make stop; \
fi
@echo ServiceSettings.EnableLocalMode must be set to true.
bin/mmctl config set TeamSettings.MaxUsersPerTeam 100 --local
bin/mmctl sampledata -u 60 --local
@echo You may need to restart the Mattermost server before using the following
@echo ========================================================================

View file

@ -0,0 +1,20 @@
#!/bin/bash
total=0
max_wait_seconds=60
echo "waiting $max_wait_seconds seconds for the server to start"
while [[ "$total" -le "$max_wait_seconds" ]]; do
if bin/mmctl system status --local 2> /dev/null; then
exit 0
else
((total=total+1))
printf "."
sleep 1
fi
done
printf "\nserver didn't start in $max_wait_seconds seconds\n"
exit 1