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

Move StringIO import to use six for tests.unit.modules.zypper_test.py

Browse Source
This commit is contained in:
rallytime 2016-07-07 19:27:30 -06:00
parent 163adfd2a1
commit 1f4a75f268
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/unit/modules/zypper_test.py
View File

@ -5,9 +5,11 @@
# Import Python Libs
from __future__ import absolute_import
import os
# Import Salt Testing Libs
from salttesting import TestCase, skipIf
from salttesting.helpers import ensure_in_syspath
from salttesting.mock import (
Mock,
MagicMock,
@ -16,16 +18,14 @@ from salttesting.mock import (
NO_MOCK,
NO_MOCK_REASON
)
from salt.exceptions import CommandExecutionError
import os
from salt.ext.six.moves import configparser
import StringIO
from salttesting.helpers import ensure_in_syspath
ensure_in_syspath('../../')
# Import Salt libs
from salt.exceptions import CommandExecutionError
from salt.ext.six.moves import configparser
import salt.ext.six as six
class ZyppCallMock(object):
def __init__(self, return_value=None):
@ -443,7 +443,7 @@ class ZypperTestCase(TestCase):
'''
repos_cfg = configparser.ConfigParser()
for cfg in ['zypper-repo-1.cfg', 'zypper-repo-2.cfg']:
repos_cfg.readfp(StringIO.StringIO(get_test_data(cfg)))
repos_cfg.readfp(six.StringIO.StringIO(get_test_data(cfg)))
for alias in repos_cfg.sections():
r_info = zypper._get_repo_info(alias, repos_cfg=repos_cfg)