back to full tests.

Makefile

@@ -58,21 +58,16 @@ test:
 	find storey -name '*.pyc' -exec rm {} \;
 	find tests -name '*.pyc' -exec rm {} \;
 
-
-
 	@if [ "$(Coverage)" = "True" ]; then \
 		rm -rf coverage_reports; \
 		rm -f unit_tests.coverage; \
-		COVERAGE_FILE=unit_tests.coverage coverage run --rcfile=tests.coveragerc -m pytest ./tests/test_utils.py::test_ds_get_path_utils  --ignore=integration -rf -v; \
+		COVERAGE_FILE=unit_tests.coverage coverage run --rcfile=tests.coveragerc -m pytest --ignore=integration -rf -v .; \
 		echo "unit test coverage report:"; \
 		COVERAGE_FILE=unit_tests.coverage coverage report --rcfile=tests.coveragerc; \
 	else \
-		python -m pytest --ignore=integration -rf -v ./tests/test_utils.py::test_get_path_utils; \
+		python -m pytest --ignore=integration -rf -v . ; \
 	fi
 
-#COVERAGE_FILE=unit_tests.coverage coverage run --rcfile=tests.coveragerc --source=. -m pytest --ignore=integration -rf -v; \
-COVERAGE_FILE=unit_tests.coverage coverage run --rcfile=tests.coveragerc --source=. -m pytest --ignore=integration -rf -v;
-#python -m pytest --ignore=integration -rf -v . \
 
 .PHONY: bench
 bench:
@@ -88,16 +83,13 @@ integration:
 	@if [ "$(Coverage)" = "True" ]; then \
 		rm -rf coverage_reports; \
 		rm -f integration.coverage; \
-		COVERAGE_FILE=integration.coverage coverage run --rcfile=tests.coveragerc -m pytest -rf -v integration/test_aggregation_integration.py::test_aggregate_and_query_with_different_sliding_windows; \
+		COVERAGE_FILE=integration.coverage coverage run --rcfile=tests.coveragerc -m pytest -rf -v integration; \
 		echo "coverage integration report:"; \
 		COVERAGE_FILE=integration.coverage coverage report --rcfile=tests.coveragerc; \
 	else \
-		python -m pytest -rf -v integration/test_aggregation_integration.py::test_aggregate_and_query_with_different_sliding_windows || echo "continue"; \
+		python -m pytest -rf -v integration; \
 	fi
 
-#python -m pytest -rf -v integration; \
-#python -m pytest -rf -v integration/test_aggregation_integration.py::test_aggregate_and_query_with_different_sliding_windows; \
-
 .PHONY: env
 env:
 	python -m pip install -r requirements.txt