ref(tests): separate unit tests from functional tests

That way we can fail faster if the unit tests fail.

Author: Matthew Fisher

Makefile

@@ -67,10 +67,14 @@ release: check-registry
 
 deploy: build dev-release restart
 
-test: test-components push test-integration
+test: test-unit test-functional push test-integration
 
-test-components:
-	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) test &&) echo done
+test-functional:
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) test-functional &&) echo done
+
+test-unit:
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) test-unit &&) echo done
+	@$(foreach C, $(CLIENTS), $(MAKE) -C $(C) test-unit &&) echo done
 
 test-integration:
 	$(MAKE) -C tests/ test-full

client/Makefile

@@ -36,3 +36,6 @@ setup-venv:
 
 test-style: setup-venv
 	venv/bin/flake8
+
+test-unit:
+	@echo no unit tests

publisher/Makefile

@@ -49,6 +49,9 @@ stop: check-deisctl
 
 test: test-unit
 
+test-functional:
+	@echo no functional tests
+
 test-unit:
 	godep go test -v ./...
 

tests/bin/test-acceptance.sh

@@ -22,6 +22,10 @@ log_phase "Running documentation tests"
 # test building documentation
 make -C docs/ test
 
+log_phase "Running unit tests"
+
+make test-unit
+
 log_phase "Building from current source tree"
 
 # build all docker images and client binaries
@@ -30,9 +34,9 @@ make build
 # use the built client binaries
 export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client/dist:$PATH
 
-log_phase "Running unit and functional tests"
+log_phase "Running functional tests"
 
-make test-components
+make test-functional
 
 log_phase "Provisioning 3-node CoreOS"
 

tests/bin/test-integration.sh

@@ -22,6 +22,10 @@ log_phase "Running documentation tests"
 # test building documentation
 make -C docs/ test
 
+log_phase "Running unit tests"
+
+make test-unit
+
 log_phase "Building from current source tree"
 
 # build all docker images and client binaries
@@ -30,9 +34,9 @@ make build
 # use the built client binaries
 export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client/dist:$PATH
 
-log_phase "Running unit and functional tests"
+log_phase "Running functional tests"
 
-make test-components
+make test-functional
 
 log_phase "Provisioning 3-node CoreOS"
 

tests/bin/test-smoke.sh

@@ -22,6 +22,10 @@ log_phase "Running documentation tests"
 # test building documentation
 make -C docs/ test
 
+log_phase "Running unit tests"
+
+make test-unit
+
 log_phase "Building from current source tree"
 
 # build all docker images and client binaries
@@ -30,9 +34,9 @@ make build
 # use the built client binaries
 export PATH=$DEIS_ROOT/deisctl:$DEIS_ROOT/client/dist:$PATH
 
-log_phase "Running unit and functional tests"
+log_phase "Running functional tests"
 
-make test-components
+make test-functional
 
 log_phase "Provisioning 3-node CoreOS"