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 unit.modules.test_qemu_nbd for Windows

Browse source 
Use os.sep
This commit is contained in:
twangboy 2017-09-07 15:44:35 -06:00
parent f959113694
commit 531ce8022b
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/unit/modules/test_qemu_nbd.py
View file

@ -80,15 +80,14 @@ class QemuNbdTestCase(TestCase, LoaderModuleMockMixin):
with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
with patch.object(os.path, 'isfile', mock):
with patch.object(glob, 'glob',
MagicMock(return_value=['/dev/nbd0'])):
with patch.dict(qemu_nbd.__salt__,
{'cmd.run': mock,
'mount.mount': mock,
'cmd.retcode': MagicMock(side_effect=[1, 0])}):
self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
{'{0}/nbd/nbd0/nbd0'.format(tempfile.gettempdir()): '/dev/nbd0'})
with patch.object(os.path, 'isfile', mock),\
patch.object(glob, 'glob', MagicMock(return_value=['/dev/nbd0'])),\
patch.dict(qemu_nbd.__salt__,
{'cmd.run': mock,
'mount.mount': mock,
'cmd.retcode': MagicMock(side_effect=[1, 0])}):
expected = {os.sep.join([tempfile.gettempdir(), 'nbd', 'nbd0', 'nbd0']): '/dev/nbd0'}
self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'), expected)
# 'clear' function tests: 1