From f01229827f6c98d5786b3916b6b1ef15c6c524a0 Mon Sep 17 00:00:00 2001 From: James Page Date: Tue, 23 Feb 2016 17:55:02 +0000 Subject: [PATCH] Add tox support --- .bzrignore | 2 ++ .testr.conf | 8 ++++++ hooks/neutron_contexts.py | 5 ++-- hooks/neutron_hooks.py | 2 +- requirements.txt | 12 ++++++++ test-requirements.txt | 8 ++++++ tox.ini | 29 ++++++++++++++++++++ unit_tests/test_actions_openstack_upgrade.py | 1 + unit_tests/test_neutron_contexts.py | 2 +- 9 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 .testr.conf create mode 100644 requirements.txt create mode 100644 test-requirements.txt create mode 100644 tox.ini diff --git a/.bzrignore b/.bzrignore index 421e2bda..66484d6f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,3 +1,5 @@ bin .coverage tags +.tox +.testrepository diff --git a/.testr.conf b/.testr.conf new file mode 100644 index 00000000..801646bb --- /dev/null +++ b/.testr.conf @@ -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 diff --git a/hooks/neutron_contexts.py b/hooks/neutron_contexts.py index 4d449952..e73776d8 100644 --- a/hooks/neutron_contexts.py +++ b/hooks/neutron_contexts.py @@ -89,9 +89,8 @@ def remap_plugin(plugin): def core_plugin(): plugin = remap_plugin(config('plugin')) - if (get_os_codename_install_source(config('openstack-origin')) - >= 'icehouse' - and plugin == OVS): + if (get_os_codename_install_source(config('openstack-origin')) >= + 'icehouse' and plugin == OVS): return NEUTRON_ML2_PLUGIN else: return CORE_PLUGIN[networking_name()][plugin] diff --git a/hooks/neutron_hooks.py b/hooks/neutron_hooks.py index d4d8c75e..2a036bb9 100755 --- a/hooks/neutron_hooks.py +++ b/hooks/neutron_hooks.py @@ -315,7 +315,7 @@ def update_nrpe_config(): shortname="netns", description='Network Namespace check {%s}' % current_unit, check_cmd='check_status_file.py -f /var/lib/nagios/netns-check.txt' - ) + ) nrpe_setup.write() diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..2cc5f64a --- /dev/null +++ b/requirements.txt @@ -0,0 +1,12 @@ +# 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 +python-neutronclient>=2.6.0 diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 00000000..3af44d73 --- /dev/null +++ b/test-requirements.txt @@ -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 diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..8278f3dc --- /dev/null +++ b/tox.ini @@ -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 actions + charm proof + +[testenv:venv] +commands = {posargs} + +[flake8] +ignore = E402,E226 +exclude = hooks/charmhelpers diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py index 4c31893f..df10613e 100644 --- a/unit_tests/test_actions_openstack_upgrade.py +++ b/unit_tests/test_actions_openstack_upgrade.py @@ -14,6 +14,7 @@ with patch('charmhelpers.core.hookenv.status_set'): TO_PATCH = [ 'do_openstack_upgrade', 'config_changed', + 'get_common_package', ] diff --git a/unit_tests/test_neutron_contexts.py b/unit_tests/test_neutron_contexts.py index 100de7f7..ad24050c 100644 --- a/unit_tests/test_neutron_contexts.py +++ b/unit_tests/test_neutron_contexts.py @@ -55,7 +55,7 @@ class TestL3AgentContext(CharmTestCase): self.config.side_effect = self.test_config.get @patch('neutron_contexts.NeutronAPIContext') - def test_no_ext_netid(self, _NeutronAPIContext): + def test_no_ext_netid(self, _NeutronAPIContext): _NeutronAPIContext.return_value = \ DummyNeutronAPIContext(return_value={'enable_dvr': False}) self.test_config.set('run-internal-router', 'none')