test(component): add make test to deis/registry and unit tests for controller

Author: mboersma

Makefile

@@ -118,9 +118,17 @@ status: check-fleet
 stop: check-fleet
 	$(FLEETCTL) stop -block-attempts=600 $(strip $(call deis_units,launched,active))
 
+test: .PHONY
+	@$(foreach C,$(ALL_COMPONENTS), \
+		echo \\nTesting deis/$(C) ; \
+		$(MAKE) -C $(C) test ; \
+	)
+
 tests:
 	cd test && bundle install && bundle exec rake
 
 uninstall: check-fleet stop
 	$(FLEETCTL) unload $(call deis_units,launched,.)
 	$(FLEETCTL) destroy $(strip $(call deis_units,.,.))
+
+.PHONY:

builder/Makefile

@@ -26,3 +26,11 @@ clean: uninstall
 
 full-clean: clean
 	$(call ssh_all,'sudo docker rmi deis/builder')
+
+test: test-unit test-functional
+
+test-unit:
+	@echo no unit tests
+
+test-functional:
+	@echo no functional tests

cache/Makefile

@@ -26,3 +26,11 @@ clean: uninstall
 
 full-clean: clean
 	$(call ssh_all,'sudo docker rmi deis/cache')
+
+test: test-unit test-functional
+
+test-unit:
+	@echo no unit tests
+
+test-functional:
+	@echo no functional tests

controller/Makefile

@@ -31,9 +31,6 @@ clean: uninstall
 full-clean: clean
 	$(call ssh_all,'sudo docker rmi deis/controller')
 
-test:
-	python manage.py test --noinput api
-
 runserver:
 	python manage.py runserver
 
@@ -46,3 +43,13 @@ coverage:
 
 flake8:
 	flake8
+
+test: test-unit test-functional
+
+test-unit:
+	@if [ ! -d venv ]; then virtualenv venv; fi
+	venv/bin/pip install -q -r requirements.txt
+	venv/bin/python manage.py test --noinput api
+
+test-functional:
+	@echo no functional tests

database/Makefile

@@ -26,3 +26,11 @@ clean: uninstall
 
 full-clean: clean
 	$(call ssh_all,'sudo docker rmi deis/database')
+
+test: test-unit test-functional
+
+test-unit:
+	@echo no unit tests
+
+test-functional:
+	@echo no functional tests

logger/Makefile

@@ -26,3 +26,11 @@ clean: uninstall
 
 full-clean: clean
 	$(call ssh_all,'sudo docker rmi deis/logger')
+
+test: test-unit test-functional
+
+test-unit:
+	@echo no unit tests
+
+test-functional:
+	go test -v ./...

registry/.gitignore

@@ -0,0 +1,2 @@
+# test-unit temporary files
+test-unit/

registry/Makefile

@@ -26,3 +26,21 @@ clean: uninstall
 
 full-clean: clean
 	$(call ssh_all,'sudo docker rmi deis/registry')
+
+test: test-unit test-functional
+
+test-unit: .PHONY
+	@if [ ! -d test-unit ]; then \
+	    git clone -b 0.6.8 https://github.com/dotcloud/docker-registry test-unit; \
+	fi
+	@if [ ! -d venv ]; then virtualenv venv; fi
+	venv/bin/pip install -q -r test-unit/requirements.txt
+	venv/bin/pip install -q -r test-unit/test-requirements.txt
+	cd test-unit && \
+		DOCKER_REGISTRY_CONFIG=config_test.yml SETTINGS_FLAVOR=test PYTHONPATH=test \
+		../venv/bin/python -m unittest discover -s test
+
+test-functional:
+	@echo no functional tests
+
+.PHONY:

router/Makefile

@@ -42,3 +42,11 @@ clean: uninstall
 
 full-clean: clean
 	$(call ssh_all,'sudo docker rmi deis/router')
+
+test: test-unit test-functional
+
+test-unit:
+	@echo no unit tests
+
+test-functional:
+	@echo no functional tests