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

py3: fix tests/unit/pillar_test.py

Browse source 
- write bytes to temp files
- work around py3 mock bug
This commit is contained in:
Michael Steed 2015-06-11 10:33:00 -06:00
parent 11b99bafc3
commit 4b6b4d1cad
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/unit/pillar_test.py
View file

@ -103,7 +103,7 @@ class PillarTestCase(TestCase):
)
@patch('salt.pillar.salt.fileclient.get_file_client', autospec=True)
@patch('salt.pillar.salt.minion.Matcher', autospec=True)
@patch('salt.pillar.salt.minion.Matcher') # autospec=True disabled due to py3 mock bug
def test_topfile_order(self, Matcher, get_file_client):
opts = {
'renderer': 'yaml',
@ -134,7 +134,7 @@ class PillarTestCase(TestCase):
nodegroup_order, glob_order):
# Write a simple topfile and two pillar state files
self.top_file = tempfile.NamedTemporaryFile()
self.top_file.write('''
s = '''
base:
group:
- match: nodegroup
@ -143,16 +143,17 @@ base:
minion:
- order: {glob_order}
- ssh.minion
'''.format(nodegroup_order=nodegroup_order, glob_order=glob_order))
'''.format(nodegroup_order=nodegroup_order, glob_order=glob_order)
self.top_file.write(salt.utils.to_bytes(s))
self.top_file.flush()
self.ssh_file = tempfile.NamedTemporaryFile()
self.ssh_file.write('''
self.ssh_file.write(b'''
ssh:
foo
''')
self.ssh_file.flush()
self.ssh_minion_file = tempfile.NamedTemporaryFile()
self.ssh_minion_file.write('''
self.ssh_minion_file.write(b'''
ssh:
bar
''')