From 39a8a0f88eb8c354ad4beabb4306f618bf4d7f75 Mon Sep 17 00:00:00 2001 From: Kamil Mankowski Date: Fri, 19 Apr 2019 10:04:56 +0200 Subject: [PATCH] Don't ignore test results without FEATURE When no FEATURE is passed to make test, results of test shouldn't be ignored, so CI can work properly --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6c70f69..7cd5fbc 100644 --- a/Makefile +++ b/Makefile @@ -39,14 +39,14 @@ lint: ## check code style and formatting with flake8 test-unit: missing-conf ## run all unit tests ifndef FEATURE - -SETTINGS_PATH=$(SETTINGS_TEST) FLASK_APP=$(APP) pytest -m unit + SETTINGS_PATH=$(SETTINGS_TEST) FLASK_APP=$(APP) pytest -m unit else -SETTINGS_PATH=$(SETTINGS_TEST) FLASK_APP=$(APP) pytest -m 'unit and $(FEATURE)' endif test-integration: missing-conf ## run all integration tests ifndef FEATURE - -SETTINGS_PATH=$(SETTINGS_TEST) FLASK_APP=$(APP) pytest -m integration + SETTINGS_PATH=$(SETTINGS_TEST) FLASK_APP=$(APP) pytest -m integration else -SETTINGS_PATH=$(SETTINGS_TEST) FLASK_APP=$(APP) pytest -m 'integration and $(FEATURE)' endif