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

Merge pull request #41082 from rallytime/fix-spm-unit-tests

Browse Source 
Patch calls to salt.client.Caller and salt.client.get_local_client in spm unit tests
This commit is contained in:
Mike Place 2017-05-05 10:05:43 -06:00 committed by GitHub
commit 127eb04ff6
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/unit/test_spm.py
View File

@ -8,7 +8,7 @@ import tempfile
# Import Salt Testing libs
from tests.support.unit import TestCase
from tests.support.mock import patch
from tests.support.mock import patch, MagicMock
from tests.support.helpers import destructiveTest
from tests.support.mixins import AdaptedConfigurationTestCaseMixin
import salt.config
@ -107,11 +107,15 @@ class SPMTest(TestCase, AdaptedConfigurationTestCaseMixin):
def test_build_install(self):
# Build package
fdir = self._create_formula_files(_F1)
self.client.run(['build', fdir])
with patch('salt.client.Caller', MagicMock(return_value=self.minion_opts)):
with patch('salt.client.get_local_client', MagicMock(return_value=self.minion_opts['conf_file'])):
self.client.run(['build', fdir])
pkgpath = self.ui._status[-1].split()[-1]
assert os.path.exists(pkgpath)
# Install package
self.client.run(['local', 'install', pkgpath])
with patch('salt.client.Caller', MagicMock(return_value=self.minion_opts)):
with patch('salt.client.get_local_client', MagicMock(return_value=self.minion_opts['conf_file'])):
self.client.run(['local', 'install', pkgpath])
# Check filesystem
for path, contents in _F1['contents']:
path = os.path.join(self.minion_config['file_roots']['base'][0], _F1['definition']['name'], path)
@ -119,7 +123,9 @@ class SPMTest(TestCase, AdaptedConfigurationTestCaseMixin):
with salt.utils.fopen(path, 'r') as rfh:
assert rfh.read() == contents
# Check database
self.client.run(['info', _F1['definition']['name']])
with patch('salt.client.Caller', MagicMock(return_value=self.minion_opts)):
with patch('salt.client.get_local_client', MagicMock(return_value=self.minion_opts['conf_file'])):
self.client.run(['info', _F1['definition']['name']])
lines = self.ui._status[-1].split('\n')
for key, line in (
('name', 'Name: {0}'),
@ -129,12 +135,16 @@ class SPMTest(TestCase, AdaptedConfigurationTestCaseMixin):
assert line.format(_F1['definition'][key]) in lines
# Reinstall with force=False, should fail
self.ui._error = []
self.client.run(['local', 'install', pkgpath])
with patch('salt.client.Caller', MagicMock(return_value=self.minion_opts)):
with patch('salt.client.get_local_client', MagicMock(return_value=self.minion_opts['conf_file'])):
self.client.run(['local', 'install', pkgpath])
assert len(self.ui._error) > 0
# Reinstall with force=True, should succeed
with patch.dict(self.minion_config, {'force': True}):
self.ui._error = []
self.client.run(['local', 'install', pkgpath])
with patch('salt.client.Caller', MagicMock(return_value=self.minion_opts)):
with patch('salt.client.get_local_client', MagicMock(return_value=self.minion_opts['conf_file'])):
self.client.run(['local', 'install', pkgpath])
assert len(self.ui._error) == 0
def test_failure_paths(self):
@ -166,5 +176,7 @@ class SPMTest(TestCase, AdaptedConfigurationTestCaseMixin):
for args in fail_args:
self.ui._error = []
self.client.run(args)
with patch('salt.client.Caller', MagicMock(return_value=self.minion_opts)):
with patch('salt.client.get_local_client', MagicMock(return_value=self.minion_opts['conf_file'])):
self.client.run(args)
assert len(self.ui._error) > 0