Merge lp:~zulcss/charms/trusty/lxd/lxd-tox into lp:~openstack-charmers-archive/charms/trusty/lxd/next

[Chuck Short]

Add tox

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

charm_lint_check #1476 lxd-next for zulcss mp287197
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1476/

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

charm_unit_test #1232 lxd-next for zulcss mp287197
    UNIT FAIL: unit-test failed

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

Full unit test output: http://paste.ubuntu.com/15198433/
Build: http://10.245.162.36:8080/job/charm_unit_test/1232/

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

charm_amulet_test #531 lxd-next for zulcss mp287197
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/531/

=== added file 'requirements.txt'
--- requirements.txt	1970-01-01 00:00:00 +0000
+++ requirements.txt	2016-02-25 16:03:46 +0000
@@ -0,0 +1,5 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+PyYAML>=3.1.0
+

=== added file 'test-requirements.txt'
--- test-requirements.txt	1970-01-01 00:00:00 +0000
+++ test-requirements.txt	2016-02-25 16:03:46 +0000
@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+coverage>=3.6
+mock>=1.2
+flake8>=2.2.4,<=2.4.1
+os-testr>=0.4.1
+charm-tools

=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2016-02-25 16:03:46 +0000
@@ -0,0 +1,29 @@
+[tox]
+envlist = pep8,py27
+skipsdist = True
+
+[testenv]
+setenv = VIRTUAL_ENV={envdir}
+         PYTHONHASHSEED=0
+install_command =
+  pip install --allow-unverified python-apt {opts} {packages}
+commands = ostestr {posargs}
+
+[testenv:py27]
+basepython = python2.7
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
+[testenv:pep8]
+basepython = python2.7
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = flake8 {posargs} hooks unit_tests tests
+           charm proof
+
+[testenv:venv]
+commands = {posargs}
+
+[flake8]
+ignore = E402,E226
+exclude = hooks/charmhelpers