mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Change `path
` value from a tuple to a list
The type of the ``path`` value changed in #38188. This updates the type in the unit test, as well as rearranges some of the imports to be more standardized with ``ensure_in_syspath``.
This commit is contained in:
parent
6d78adbf08
commit
2acb188ac9
1 changed files with 8 additions and 7 deletions
|
@ -6,11 +6,6 @@
|
|||
# Import Python libs
|
||||
from __future__ import absolute_import
|
||||
|
||||
# Import Salt Libs
|
||||
from salt.modules import cp
|
||||
from salt.utils import templates
|
||||
from salt.exceptions import CommandExecutionError
|
||||
|
||||
# Import Salt Testing Libs
|
||||
from salttesting import skipIf, TestCase
|
||||
from salttesting.helpers import ensure_in_syspath
|
||||
|
@ -25,6 +20,13 @@ from salttesting.mock import (
|
|||
|
||||
ensure_in_syspath('../../')
|
||||
|
||||
# Import Salt Libs
|
||||
from salt.modules import cp
|
||||
from salt.utils import templates
|
||||
from salt.exceptions import CommandExecutionError
|
||||
import salt.utils
|
||||
import salt.transport
|
||||
|
||||
# Globals
|
||||
cp.__salt__ = {}
|
||||
cp.__opts__ = {}
|
||||
|
@ -144,7 +146,6 @@ class CpTestCase(TestCase):
|
|||
'''
|
||||
Test if push works with good posix path.
|
||||
'''
|
||||
import salt
|
||||
response = cp.push('/saltines/test.file')
|
||||
self.assertEqual(response, True)
|
||||
self.assertEqual(salt.utils.fopen().read.call_count, 2)
|
||||
|
@ -153,7 +154,7 @@ class CpTestCase(TestCase):
|
|||
loc=salt.utils.fopen().tell(),
|
||||
cmd='_file_recv',
|
||||
tok='token',
|
||||
path=('saltines', 'test.file'),
|
||||
path=['saltines', 'test.file'],
|
||||
data='', # data is empty here because load['data'] is overwritten
|
||||
id='abc'
|
||||
)
|
||||
|
|
Loading…
Add table
Reference in a new issue