mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +00:00
6d52aeb739
On PY2, when os.walk is invoked with a str as input, the paths in the
return data are all str types as well. This leaves undecoded unicode
data in those strings when files/dirs under the top dir that was passed
contain unicode characters in the filename.
>>> import os
>>> list(os.walk('temp'))
[('temp', [], ['\xd0\x94.txt', 'foo.txt'])]
>>> list(os.walk(u'temp'))
[(u'temp', [], [u'\u0414.txt', u'foo.txt'])]
The helper introduced here ensures that we always invoke os.walk with a
unicode top-level dir, so that we get unicode types in the return data.
93 lines
2.7 KiB
Python
93 lines
2.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Rahul Handay <rahulha@saltstack.com>`
|
|
'''
|
|
|
|
# Import Python Libs
|
|
from __future__ import absolute_import
|
|
import os
|
|
|
|
# Import Salt Testing Libs
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
|
from tests.support.unit import TestCase, skipIf
|
|
from tests.support.mock import (
|
|
MagicMock,
|
|
patch,
|
|
NO_MOCK,
|
|
NO_MOCK_REASON
|
|
)
|
|
|
|
# Import Salt Libs
|
|
import salt.config
|
|
import salt.utils.path
|
|
from salt.syspaths import BASE_FILE_ROOTS_DIR
|
|
import salt.states.winrepo as winrepo
|
|
|
|
|
|
class MockRunnerClient(object):
|
|
'''
|
|
Mock RunnerClient class
|
|
'''
|
|
def __init__(self):
|
|
pass
|
|
|
|
class RunnerClient(object):
|
|
'''
|
|
Mock RunnerClient class
|
|
'''
|
|
def __init__(self, master_config):
|
|
'''
|
|
init method
|
|
'''
|
|
pass
|
|
|
|
@staticmethod
|
|
def cmd(arg1, arg2):
|
|
'''
|
|
Mock cmd method
|
|
'''
|
|
return []
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class WinrepoTestCase(TestCase, LoaderModuleMockMixin):
|
|
'''
|
|
Validate the winrepo state
|
|
'''
|
|
def setup_loader_modules(self):
|
|
patcher = patch('salt.states.winrepo.salt.runner', MockRunnerClient)
|
|
patcher.start()
|
|
self.addCleanup(patcher.stop)
|
|
return {winrepo: {}}
|
|
|
|
def test_genrepo(self):
|
|
'''
|
|
Test to refresh the winrepo.p file of the repository
|
|
'''
|
|
ret = {'name': 'salt',
|
|
'changes': {},
|
|
'result': False,
|
|
'comment': ''}
|
|
ret.update({'comment': '{0} is missing'.format(
|
|
os.sep.join([BASE_FILE_ROOTS_DIR, 'win', 'repo']))})
|
|
self.assertDictEqual(winrepo.genrepo('salt'), ret)
|
|
|
|
mock = MagicMock(return_value={'winrepo_dir': 'salt',
|
|
'winrepo_cachefile': 'abc'})
|
|
with patch.object(salt.config, 'master_config', mock):
|
|
mock = MagicMock(return_value=[0, 1, 2, 3, 4, 5, 6, 7, 8])
|
|
with patch.object(os, 'stat', mock):
|
|
mock = MagicMock(return_value=[])
|
|
with patch.object(salt.utils.path, 'os_walk', mock):
|
|
with patch.dict(winrepo.__opts__, {'test': True}):
|
|
ret.update({'comment': '', 'result': None})
|
|
self.assertDictEqual(winrepo.genrepo('salt'), ret)
|
|
|
|
with patch.dict(winrepo.__opts__, {'test': False}):
|
|
ret.update({'result': True})
|
|
self.assertDictEqual(winrepo.genrepo('salt'), ret)
|
|
|
|
ret.update({'changes': {'winrepo': []}})
|
|
self.assertDictEqual(winrepo.genrepo('salt', True),
|
|
ret)
|