From 08992a241813bed0b23405ebdea95564fca5e32a Mon Sep 17 00:00:00 2001 From: trotttrotttrott Date: Thu, 17 Jan 2019 14:47:39 -0700 Subject: [PATCH 1/3] Fix test_preconditions path to preconditions module --- test/scripts/preconditions/test_preconditions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/preconditions/test_preconditions.py b/test/scripts/preconditions/test_preconditions.py index 37ebf25f..c4288eba 100755 --- a/test/scripts/preconditions/test_preconditions.py +++ b/test/scripts/preconditions/test_preconditions.py @@ -21,7 +21,7 @@ os.path.abspath( os.path.join( os.path.dirname(__file__), - '../../../scripts/preconditions'))) + '../../../modules/core_project_factory/scripts/preconditions'))) import preconditions # noqa: E402 From 3a46ff8c7924f063042bdccff16cdb39f9e2f7d8 Mon Sep 17 00:00:00 2001 From: trotttrotttrott Date: Thu, 17 Jan 2019 14:50:21 -0700 Subject: [PATCH 2/3] Make targets for preconditions and migrate script tests --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 92f6d383..56ca0568 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,16 @@ check_headers: ## Check that source files have appropriate boilerplate @echo "Checking file headers" @python test/verify_boilerplate.py +.PHONY: test_migrate +test_migrate: + @echo "Testing migrate script" + @python test/helpers/test_migrate.py + +.PHONY: test_preconditions +test_preconditions: + @echo "Testing preconditions script" + @python test/scripts/preconditions/test_preconditions.py + # Integration tests .PHONY: test_integration test_integration: ## Run integration tests From 41426f704fc48dc93f4f6f10e47072d3c4765acd Mon Sep 17 00:00:00 2001 From: trotttrotttrott Date: Thu, 17 Jan 2019 15:12:36 -0700 Subject: [PATCH 3/3] Add test_unit Make target This should have all unit test targets as dependencies. This target is intended to be run in a dedicated job within the project-factory Concourse pipeline. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 56ca0568..9e13531d 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,10 @@ test_preconditions: @echo "Testing preconditions script" @python test/scripts/preconditions/test_preconditions.py +# Unit tests +.PHONY: test_unit +test_unit: test_migrate test_preconditions + # Integration tests .PHONY: test_integration test_integration: ## Run integration tests