Merge lp:~james-page/charms/trusty/nova-cloud-controller/tox into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[James Page]

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

charm_lint_check #12920 nova-cloud-controller-next for james-page mp276219
    LINT OK: passed

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

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

charm_unit_test #11996 nova-cloud-controller-next for james-page mp276219
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11996/

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

charm_amulet_test #7661 nova-cloud-controller-next for james-page mp276219
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7661/

[Corey Bryant (corey.bryant)]

Looks good and tox tests run successfully.

review: Approve

[Corey Bryant (corey.bryant)]

Note: I added actions dir to lint tests

=== modified file '.bzrignore'
--- .bzrignore	2015-04-22 21:48:17 +0000
+++ .bzrignore	2015-10-30 06:30:39 +0000
@@ -1,3 +1,5 @@
 bin
 .coverage
+.testrepository
+.tox
 tags
 
=== added file '.testr.conf'
--- .testr.conf	1970-01-01 00:00:00 +0000
+++ .testr.conf	2015-10-30 06:30:39 +0000
@@ -0,0 +1,8 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             ${PYTHON:-python} -m subunit.run discover -t ./ ./unit_tests $LISTOPT $IDOPTION
+
+test_id_option=--load-list $IDFILE
+test_list_option=--list
 
=== added file 'requirements.txt'
--- requirements.txt	1970-01-01 00:00:00 +0000
+++ requirements.txt	2015-10-30 06:30:39 +0000
@@ -0,0 +1,11 @@
+# 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
+simplejson>=2.2.0
+netifaces>=0.10.4
+netaddr>=0.7.12,!=0.7.16
+Jinja2>=2.6  # BSD License (3 clause)
+six>=1.9.0
+dnspython>=1.12.0
+psutil>=1.1.1,<2.0.0
 
=== added file 'test-requirements.txt'
--- test-requirements.txt	1970-01-01 00:00:00 +0000
+++ test-requirements.txt	2015-10-30 06:30:39 +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	2015-10-30 06:30:39 +0000
@@ -0,0 +1,29 @@
+[tox]
+envlist = lint,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:lint]
+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