diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-02-26 16:50:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-26 16:50:45 +0000 |
| commit | 53cd7f8176c996014decb7311d9f546f6b8f2497 (patch) | |
| tree | d3cb7a4537b032c010b758130a4e11c66fd097d0 /functest/tests | |
| parent | 00182139afbfa67541340d46e49d948d1f69840c (diff) | |
| parent | 70886a190335f02f1c7ed1d9c50823f978b291b1 (diff) | |
Merge "Raise exceptions when SDN_CONTROLLER_IP is None"
Diffstat (limited to 'functest/tests')
| -rw-r--r-- | functest/tests/unit/odl/test_odl.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index aa31703b..65784ae5 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -282,6 +282,15 @@ class ODLRunTesting(ODLTesting): return_value=ODLTesting._neutron_url) @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.' 'get_credentials') + def _test_missing_value(self, *args): + self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) + args[0].assert_called_once_with() + args[1].assert_called_once_with(mock.ANY, 'network') + + @mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint', + return_value=ODLTesting._neutron_url) + @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.' + 'get_credentials') def _test_run(self, status=testcase.TestCase.EX_OK, exception=None, *args, **kwargs): odlip = kwargs['odlip'] if 'odlip' in kwargs else '127.0.0.3' @@ -361,7 +370,7 @@ class ODLRunTesting(ODLTesting): odlwebport=self._odl_webport) def test_no_sdn_controller_ip(self): - self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) + self._test_missing_value() def test_without_installer_type(self): os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip @@ -386,7 +395,7 @@ class ODLRunTesting(ODLTesting): def test_apex_no_controller_ip(self): os.environ["INSTALLER_TYPE"] = "apex" - self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) + self._test_missing_value() def test_apex(self): os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip @@ -397,7 +406,7 @@ class ODLRunTesting(ODLTesting): def test_netvirt_no_controller_ip(self): os.environ["INSTALLER_TYPE"] = "netvirt" - self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) + self._test_missing_value() def test_netvirt(self): os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip @@ -414,7 +423,7 @@ class ODLRunTesting(ODLTesting): def test_daisy_no_controller_ip(self): os.environ["INSTALLER_TYPE"] = "daisy" - self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR) + self._test_missing_value() def test_daisy(self): os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip |