Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add testing tools from master branch #38

Open
wants to merge 1 commit into
base: 2.3
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Help
.SILENT:
.PHONY: help

help: ## Display this help
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

# Docker
docker-up: ## start docker elasticsearch server
docker-compose up -d elasticsearch
docker-down: ## start docker elasticsearch server
docker-compose down

# Testing
test: test-unit test-behavior ## launch full test suite
test-unit: ## launch unit tests
./vendor/bin/atoum
test-behavior: docker-up ## launch behavior tests
./scripts/waitForElastic.sh
./vendor/bin/behat
make docker-down
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is that really a wanted behaviour, to make docker up and down each time ?

Wouldn't it be wiser to add that overhead only for the full test suite, which would allow using test-behaviour several time in succession without all the overhead while doing it manually, and keeping the automation in the full test ?

And also, why is there docker-up without make, and make docker-up some lines after ?


21 changes: 21 additions & 0 deletions scripts/waitForElastic.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/env bash
echo -n "Waiting for elasticsearch to be ready ..."

code=`curl --write-out %{http_code} --silent --output /dev/null http://localhost:9200/_cluster/health`;
iteration=0;

while [ $code -ne 200 ] ; do
sleep 1;
/bin/echo -n ".";

code=`curl --write-out %{http_code} --silent --output /dev/null http://localhost:9200/_cluster/health`;
iteration=`expr $iteration + 1`;

if [ $iteration -gt 180 ]; then
echo "TIMEOUT !"
exit 1;
fi
done;

echo " READY !" ;
exit 0;