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

[James Page]

[Corey Bryant (corey.bryant)]

Code looks good, I just want to run tests before landing.

[Corey Bryant (corey.bryant)]

The usual osci tests didn't reported back but I'm going to land this because tox tests are running successfully as well as make lint/test. These changes won't affect amulet tests.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-07-02 08:05:06 +0000
+++ .bzrignore	2015-11-02 09:43:34 +0000
@@ -1,2 +1,5 @@
 bin
 .coverage
+.testrepository
+.tox
+tags
 
=== added file '.testr.conf'
--- .testr.conf	1970-01-01 00:00:00 +0000
+++ .testr.conf	2015-11-02 09:43:34 +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-11-02 09:43:34 +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-11-02 09:43:34 +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
 
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-10-20 03:13:07 +0000
+++ tests/basic_deployment.py	2015-11-02 09:43:34 +0000
@@ -506,7 +506,7 @@
                 'auth_uri': auth_uri,
                 'auth_host': ks_rel['auth_host'],
                 'auth_port': ks_rel['auth_port'],
-                'auth_protocol':  ks_rel['auth_protocol'],
+                'auth_protocol': ks_rel['auth_protocol'],
                 'admin_tenant_name': 'services',
                 'admin_user': 'ceilometer',
                 'admin_password': ks_rel['service_password'],
 
=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2015-11-02 09:43:34 +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 actions
+           charm proof
+
+[testenv:venv]
+commands = {posargs}
+
+[flake8]
+ignore = E402,E226
+exclude = hooks/charmhelpers