From 118d3a9d8ec4e32dec6a91bbaea93d5e14562e42 Mon Sep 17 00:00:00 2001 From: Pipo Bimbo Date: Tue, 24 Jan 2023 08:50:33 +0100 Subject: [PATCH] separate log file for both steps of the tests --- docker/test | 22 +++++++++++++++++++--- docker/test-log | 17 ----------------- 2 files changed, 19 insertions(+), 20 deletions(-) delete mode 100755 docker/test-log diff --git a/docker/test b/docker/test index 3420c7595b..212df0f277 100755 --- a/docker/test +++ b/docker/test @@ -1,7 +1,23 @@ #!/bin/bash set -e -# This script runs the entire test suite AND logs the screen output. - +# This test script : +# - prepares the database for rspec tests +# - launches the rspec tests DATE=`date +%Y%m%d-%H%M%S-%3N` -docker/test-log 2>&1 | tee log/test-$DATE.log + +echo '--------------------------------------------------------------' +echo 'BEGIN: docker-compose run web bundle exec rake db:test:prepare' +echo '--------------------------------------------------------------' +docker-compose run web bundle exec rake db:test:prepare 2>&1 | tee log/test-prepare-$DATE.log +echo '------------------------------------------------------------' +echo 'END: docker-compose run web bundle exec rake db:test:prepare' +echo '------------------------------------------------------------' + +echo '----------------------------------------------------' +echo 'BEGIN: docker-compose run web bundle exec rspec spec' +echo '----------------------------------------------------' +docker-compose run web bundle exec rspec --no-color spec 2>&1 | tee log/test-rspec-$DATE.log +echo '--------------------------------------------------' +echo 'END: docker-compose run web bundle exec rspec spec' +echo '--------------------------------------------------' \ No newline at end of file diff --git a/docker/test-log b/docker/test-log deleted file mode 100755 index 4769212968..0000000000 --- a/docker/test-log +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -echo '--------------------------------------------------------------' -echo 'BEGIN: docker-compose run web bundle exec rake db:test:prepare' -echo '--------------------------------------------------------------' -docker-compose run web bundle exec rake db:test:prepare -echo '------------------------------------------------------------' -echo 'END: docker-compose run web bundle exec rake db:test:prepare' -echo '------------------------------------------------------------' - -echo '----------------------------------------------------' -echo 'BEGIN: docker-compose run web bundle exec rspec spec' -echo '----------------------------------------------------' -docker-compose run web bundle exec rspec spec -echo '--------------------------------------------------' -echo 'END: docker-compose run web bundle exec rspec spec' -echo '--------------------------------------------------'