valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt mocked tests to the changes in #6833

Browse Source
This commit is contained in:
Pedro Algarvio 2013-09-10 11:13:16 +01:00
parent 58b3d4957c
commit 70937172ce
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/unit/modules/pip_test.py
View File

@ -783,14 +783,14 @@ class PipTestCase(TestCase):
'pycrypto==2.6'
]
mock = MagicMock(
return_value={
'retcode': 0,
'stdout': '\n'.join(eggs)
}
side_effect=[
{'retcode': 0, 'stdout': 'pip MOCKED_VERSION'},
{'retcode': 0, 'stdout': '\n'.join(eggs)}
]
)
with patch.dict(pip.__salt__, {'cmd.run_all': mock}):
ret = pip.list_()
mock.assert_called_once_with(
mock.assert_called_with(
'pip freeze',
runas=None,
cwd=None
@ -801,6 +801,7 @@ class PipTestCase(TestCase):
'M2Crypto': '0.21.1',
'bbfreeze-loader': '1.1.0',
'bbfreeze': '1.1.0',
'pip': 'MOCKED_VERSION',
'pycrypto': '2.6'
}
)
@ -829,7 +830,7 @@ class PipTestCase(TestCase):
)
with patch.dict(pip.__salt__, {'cmd.run_all': mock}):
ret = pip.list_(prefix='bb')
mock.assert_called_once_with(
mock.assert_called_with(
'pip freeze',
runas=None,
cwd=None
@ -923,7 +924,7 @@ class PipTestCase(TestCase):
warnings.resetwarnings()
warnings.filterwarnings('always', '', DeprecationWarning, __name__)
mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})
mock = MagicMock(return_value={'retcode': 0, 'stdout': 'pip VERSION'})
with patch.dict(pip.__salt__, {'cmd.run_all': mock}):
with warnings.catch_warnings(record=True) as w:
pip.list_('blah', runas='me!')