From 35d12db42db1e3453bdc5328befbd9ce4d2ade71 Mon Sep 17 00:00:00 2001 From: James Page Date: Tue, 23 Feb 2016 13:46:29 +0000 Subject: [PATCH 1/2] Add unit test for package resolution --- unit_tests/test_neutron_utils.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/unit_tests/test_neutron_utils.py b/unit_tests/test_neutron_utils.py index 4f9bb797..175f8bc7 100644 --- a/unit_tests/test_neutron_utils.py +++ b/unit_tests/test_neutron_utils.py @@ -169,6 +169,19 @@ class TestQuantumUtils(CharmTestCase): self.assertFalse('python-mysqldb' in packages) self.assertTrue('python-pymysql' in packages) + @patch.object(neutron_utils, 'git_install_requested') + def test_get_packages_ovs_mitaka(self, git_requested): + git_requested.return_value = False + self.config.return_value = 'ovs' + self.get_os_codename_install_source.return_value = 'mitaka' + packages = neutron_utils.get_packages() + self.assertTrue('neutron-metering-agent' in packages) + self.assertFalse('neutron-plugin-metering-agent' in packages) + self.assertTrue('neutron-openvswitch-agent' in packages) + self.assertFalse('neutron-plugin-openvswitch-agent' in packages) + self.assertFalse('python-mysqldb' in packages) + self.assertTrue('python-pymysql' in packages) + @patch.object(neutron_utils, 'git_install_requested') def test_get_packages_l3ha(self, git_requested): git_requested.return_value = False From 5a343f8f63b6fb626f0bf0e4121f99490d7277da Mon Sep 17 00:00:00 2001 From: James Page Date: Thu, 25 Feb 2016 14:18:41 +0000 Subject: [PATCH 2/2] Disable mitaka changes for now; re-enable once neutron-ovs landed --- tests/019-basic-trusty-mitaka | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 tests/019-basic-trusty-mitaka diff --git a/tests/019-basic-trusty-mitaka b/tests/019-basic-trusty-mitaka old mode 100755 new mode 100644