From 5c80958fdf004f5f816e3f66516688f3e62651ce Mon Sep 17 00:00:00 2001 From: Taylor Salo Date: Sat, 1 Aug 2020 13:12:38 -0400 Subject: [PATCH 1/3] Log CLI in pytest config. --- setup.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.cfg b/setup.cfg index e618c6e50..d00a567c0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,3 +12,6 @@ exclude=*build/ ignore = E126,E402,W504 per-file-ignores = */__init__.py:F401 + +[tool:pytest] +log_cli = true From 718906105a1523fd1e1a0b2b92782e4367aeed80 Mon Sep 17 00:00:00 2001 From: Taylor Salo Date: Sat, 1 Aug 2020 13:15:20 -0400 Subject: [PATCH 2/3] Show info-level logging during integration tests. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0fba6759c..da526fd16 100644 --- a/Makefile +++ b/Makefile @@ -18,13 +18,13 @@ unittest: @py.test --skipintegration --cov-append --cov-report term-missing --cov=tedana tedana/ three-echo: - @py.test --cov-append --cov-report term-missing --cov=tedana -k test_integration_three_echo tedana/tests/test_integration.py + @py.test --log-cli-level=20 --cov-append --cov-report term-missing --cov=tedana -k test_integration_three_echo tedana/tests/test_integration.py four-echo: - @py.test --cov-append --cov-report term-missing --cov=tedana -k test_integration_four_echo tedana/tests/test_integration.py + @py.test --log-cli-level=20 --cov-append --cov-report term-missing --cov=tedana -k test_integration_four_echo tedana/tests/test_integration.py five-echo: - @py.test --cov-append --cov-report term-missing --cov=tedana -k test_integration_five_echo tedana/tests/test_integration.py + @py.test --log-cli-level=20 --cov-append --cov-report term-missing --cov=tedana -k test_integration_five_echo tedana/tests/test_integration.py t2smap: - @py.test --cov-append --cov-report term-missing --cov=tedana -k test_integration_t2smap tedana/tests/test_integration.py + @py.test --log-cli-level=20 --cov-append --cov-report term-missing --cov=tedana -k test_integration_t2smap tedana/tests/test_integration.py From a648cd75dc267fef4107f16de58f9a1dca74ba37 Mon Sep 17 00:00:00 2001 From: Taylor Salo Date: Wed, 5 Aug 2020 22:51:25 -0400 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Elizabeth DuPre --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index da526fd16..ba8b71886 100644 --- a/Makefile +++ b/Makefile @@ -18,13 +18,13 @@ unittest: @py.test --skipintegration --cov-append --cov-report term-missing --cov=tedana tedana/ three-echo: - @py.test --log-cli-level=20 --cov-append --cov-report term-missing --cov=tedana -k test_integration_three_echo tedana/tests/test_integration.py + @py.test --log-cli-level=INFO --cov-append --cov-report term-missing --cov=tedana -k test_integration_three_echo tedana/tests/test_integration.py four-echo: - @py.test --log-cli-level=20 --cov-append --cov-report term-missing --cov=tedana -k test_integration_four_echo tedana/tests/test_integration.py + @py.test --log-cli-level=INFO --cov-append --cov-report term-missing --cov=tedana -k test_integration_four_echo tedana/tests/test_integration.py five-echo: - @py.test --log-cli-level=20 --cov-append --cov-report term-missing --cov=tedana -k test_integration_five_echo tedana/tests/test_integration.py + @py.test --log-cli-level=INFO --cov-append --cov-report term-missing --cov=tedana -k test_integration_five_echo tedana/tests/test_integration.py t2smap: - @py.test --log-cli-level=20 --cov-append --cov-report term-missing --cov=tedana -k test_integration_t2smap tedana/tests/test_integration.py + @py.test --log-cli-level=INFO --cov-append --cov-report term-missing --cov=tedana -k test_integration_t2smap tedana/tests/test_integration.py