diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-07 21:01:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-07 21:01:09 +0000 |
| commit | 83478090bbee34c6a7019682efd13c807d0758b4 (patch) | |
| tree | 12b266bf84502b9c02640470019739b021a132e8 /nova/tests | |
| parent | 4abaa7505ca0bfc3671c0762e9bca85a4ec8054d (diff) | |
| parent | 568da29e21e868f3e84846599a378a3d270f4bb4 (diff) | |
| download | nova-83478090bbee34c6a7019682efd13c807d0758b4.tar.gz | |
Merge "fix overridden error"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/unit/api/openstack/test_common.py | 2 | ||||
| -rw-r--r-- | nova/tests/unit/network/test_network_info.py | 2 | ||||
| -rw-r--r-- | nova/tests/unit/scheduler/test_ironic_host_manager.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/unit/api/openstack/test_common.py b/nova/tests/unit/api/openstack/test_common.py index c696de13d5..15330c16bd 100644 --- a/nova/tests/unit/api/openstack/test_common.py +++ b/nova/tests/unit/api/openstack/test_common.py @@ -170,7 +170,7 @@ class SortParamUtilsTest(test.NoDBTestCase): self.assertEqual(['desc'], sort_dirs) def test_get_sort_params_override_defaults(self): - '''Verifies that the defaults can be overriden.''' + '''Verifies that the defaults can be overridden.''' sort_keys, sort_dirs = common.get_sort_params({}, default_key='key1', default_dir='dir1') self.assertEqual(['key1'], sort_keys) diff --git a/nova/tests/unit/network/test_network_info.py b/nova/tests/unit/network/test_network_info.py index 0beea4744d..f7c80d58a4 100644 --- a/nova/tests/unit/network/test_network_info.py +++ b/nova/tests/unit/network/test_network_info.py @@ -647,7 +647,7 @@ iface eth0 inet static template = self._setup_injected_network_scenario(dns=False) self.assertEqual(expected, template) - def test_injection_static_overriden_template(self): + def test_injection_static_overridden_template(self): cfg.CONF.set_override( 'injected_network_template', 'nova/tests/unit/network/interfaces-override.template') diff --git a/nova/tests/unit/scheduler/test_ironic_host_manager.py b/nova/tests/unit/scheduler/test_ironic_host_manager.py index af130a4112..85873ca9bc 100644 --- a/nova/tests/unit/scheduler/test_ironic_host_manager.py +++ b/nova/tests/unit/scheduler/test_ironic_host_manager.py @@ -114,7 +114,7 @@ class IronicHostManagerTestCase(test.NoDBTestCase): # for ironic compute nodes we always return an empty dict self.assertEqual({}, rv) - # base class implementation is overriden and not called + # base class implementation is overridden and not called self.assertFalse(mock_get_instance_info.called) @mock.patch.object(host_manager.HostManager, '_get_instance_info') |