saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix failing storage and listdiffer tests

Browse source
This commit is contained in:
Alexandru Bleotu 2017-09-22 17:09:01 -04:00
parent 6b574ec5da
commit 847debab7a
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/utils/test_dictdiffer.py
View file

@ -49,7 +49,7 @@ class RecursiveDictDifferTestCase(TestCase):
def test_changed_without_ignore_unset_values(self):
self.recursive_diff.ignore_unset_values = False
self.assertEqual(self.recursive_diff.changed(),
['a.c', 'a.e', 'a.g', 'a.f', 'h', 'i'])
['a.c', 'a.e', 'a.f', 'a.g', 'h', 'i'])
def test_unchanged(self):
self.assertEqual(self.recursive_diff.unchanged(),

14
tests/unit/utils/vmware/test_storage.py
View file

@ -264,14 +264,14 @@ class GetDatastoresTestCase(TestCase):
mock_reference,
get_all_datastores=True)
mock_traversal_spec_init.assert_called([
mock_traversal_spec_init.assert_has_calls([
call(path='datastore',
skip=False,
type=vim.Datacenter),
call(path='childEntity',
selectSet=['traversal'],
skip=False,
type=vim.Folder),
call(path='datastore',
skip=False,
type=vim.Datacenter)])
type=vim.Folder)])
def test_unsupported_reference_type(self):
class FakeClass(object):
@ -379,7 +379,7 @@ class RenameDatastoreTestCase(TestCase):
with self.assertRaises(VMwareApiError) as excinfo:
salt.utils.vmware.rename_datastore(self.mock_ds_ref,
'fake_new_name')
self.assertEqual(excinfo.exception.message, 'vim_fault')
self.assertEqual(excinfo.exception.strerror, 'vim_fault')
def test_rename_datastore_raise_runtime_fault(self):
exc = vmodl.RuntimeFault()
@ -388,7 +388,7 @@ class RenameDatastoreTestCase(TestCase):
with self.assertRaises(VMwareRuntimeError) as excinfo:
salt.utils.vmware.rename_datastore(self.mock_ds_ref,
'fake_new_name')
self.assertEqual(excinfo.exception.message, 'runtime_fault')
self.assertEqual(excinfo.exception.strerror, 'runtime_fault')
def test_rename_datastore(self):
salt.utils.vmware.rename_datastore(self.mock_ds_ref, 'fake_new_name')