From de571ce0b3b02809f6b244887a841e77e6e72be2 Mon Sep 17 00:00:00 2001 From: Bruce Martin Date: Tue, 23 Feb 2021 16:49:43 -0800 Subject: [PATCH] fix local_server unit-test target (#2078) --- Makefile | 4 ---- local_server/Makefile | 25 +------------------------ 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Makefile b/Makefile index e987cee9..1344ea4a 100644 --- a/Makefile +++ b/Makefile @@ -84,10 +84,6 @@ smoke-test: smoke-test-annotations: cd client && $(MAKE) smoke-test-annotations -.PHONY: test-db-local -test-db-local: - cd local_server && $(MAKE) test-db - .PHONY: test-db test-db: cd server && $(MAKE) test-db diff --git a/local_server/Makefile b/local_server/Makefile index 872b9ae5..5f7acf13 100644 --- a/local_server/Makefile +++ b/local_server/Makefile @@ -7,7 +7,7 @@ clean: rm -f common/web/csp-hashes.json .PHONY: unit-test -unit-test: create-test-db +unit-test: PYTHONWARNINGS=ignore:ResourceWarning coverage run \ --source=app,cli,common,compute,converters,data_anndata,data_common \ --omit=.coverage,data_common/fbs/NetEncoding,venv \ @@ -15,31 +15,8 @@ unit-test: create-test-db --start-directory test/ \ --top-level-directory ../ \ --verbose; test_result=$$?; \ - $(MAKE) clean-test-db; \ exit $$test_result \ - -.PHONY: test-db -test-db: create-test-db - PYTHONWARNINGS=ignore:ResourceWarning coverage run \ - --source=app,cli,common,compute,converters,data_anndata,data_common \ - --omit=.coverage,data_common/fbs/NetEncoding,venv \ - -m unittest discover \ - --start-directory test/test_database \ - --top-level-directory ../ \ - --verbose; test_result=$$?; \ - $(MAKE) clean-test-db; \ - exit $$test_result - -.PHONY: create-test-db -create-test-db: - -docker run -d -p 5432:5432 --name test_db -e POSTGRES_PASSWORD=test_pw postgres - -.PHONY: clean-test-db -clean-test-db: - -docker stop test_db - -docker rm test_db - .PHONY: test-annotations-performance test-annotations-performance: python test/performance/performance_test_annotations_backend.py