Merge lp:~gnuoy/charms/trusty/openvswitch-odl/tox into lp:~openstack-charmers-archive/charms/trusty/openvswitch-odl/next

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14694 openvswitch-odl-next for gnuoy mp279126
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14694/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13701 openvswitch-odl-next for gnuoy mp279126
    UNIT FAIL: unit-test missing

UNIT Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full unit test output: http://paste.ubuntu.com/13600109/
Build: http://10.245.162.77:8080/job/charm_unit_test/13701/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8066 openvswitch-odl-next for gnuoy mp279126
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13600412/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8066/

Unmerged revisions

7. By Liam Young on 2015-12-01

TOX ftw

=== modified file 'Makefile'
--- Makefile	2015-11-16 08:33:32 +0000
+++ Makefile	2015-12-01 14:45:52 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/make
 PYTHON := /usr/bin/env python
+TOX := /usr/bin/env tox
 
 lint:
 	@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
@@ -9,7 +10,7 @@
 test:
 	@# Bundletester expects unit tests here.
 	@echo Starting tests...
-	@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
+	@$(TOX)
 
 functional_test:
 	@echo Starting Amulet tests...