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

Add Erik's changes

Browse source
This commit is contained in:
twangboy 2017-10-23 11:39:12 -06:00
parent 4ef1e3eb97
commit ba2f2eb788
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/states/archive.py
View file

@ -13,6 +13,7 @@ import os
import re
import shlex
import stat
import string
import tarfile
from contextlib import closing
@ -770,8 +771,10 @@ def extracted(name,
urlparsed_source.netloc,
urlparsed_source.path).rstrip(os.sep)
# urlparsed_scheme will be the drive letter if this is a Windows file path
# This checks for a drive letter as the scheme and changes it to file
if urlparsed_scheme and \
urlparsed_scheme.lower() in 'abcdefghijklmnopqrstuvwxyz':
urlparsed_scheme.lower() in string.ascii_lowercase:
urlparsed_path = ':'.join([urlparsed_scheme, urlparsed_path])
urlparsed_scheme = 'file'

29
tests/unit/states/test_archive.py
View file

@ -33,14 +33,14 @@ def _isfile_side_effect(path):
If so, just add an entry in the dictionary for the path being used for tar.
'''
return {
os.sep + os.path.join('tmp', 'foo.tar.gz'): True,
os.path.join('c:\\tmp', 'foo.tar.gz'): True,
os.sep + os.path.join('tmp', 'out'): False,
os.path.join('c:\\tmp', 'out'): False,
os.sep + os.path.join('usr', 'bin', 'tar'): True,
os.sep + os.path.join('bin', 'tar'): True,
os.sep + os.path.join('tmp', 'test_extracted_tar'): False,
os.path.join('c:\\tmp', 'test_extracted_tar'): False,
'/tmp/foo.tar.gz': True,
'c:\\tmp\\foo.tar.gz': True,
'/tmp/out': False,
'\\tmp\\out': False,
'/usr/bin/tar': True,
'/bin/tar': True,
'/tmp/test_extracted_tar': False,
'c:\\tmp\\test_extracted_tar': False,
}[path]
@ -63,11 +63,12 @@ class ArchiveTestCase(TestCase, LoaderModuleMockMixin):
archive.extracted tar options
'''
source = os.sep + os.path.join('tmp', 'foo.tar.gz')
tmp_dir = os.sep + os.path.join('tmp', 'test_extracted_tar')
if salt.utils.is_windows():
source = os.path.join('c:\\tmp', 'foo.tar.gz')
tmp_dir = os.path.join('c:\\tmp', 'test_extracted_tar')
source = 'c:\\tmp\\foo.tar.gz'
tmp_dir = 'c:\\tmp\\test_extracted_tar'
else:
source = '/tmp/foo.tar.gz'
tmp_dir = '/tmp/test_extracted_tar'
test_tar_opts = [
'--no-anchored foo',
'v -p --opt',
@ -127,7 +128,7 @@ class ArchiveTestCase(TestCase, LoaderModuleMockMixin):
Tests the call of extraction with gnutar
'''
gnutar = MagicMock(return_value='tar (GNU tar)')
source = os.sep + os.path.join('tmp', 'foo.tar.gz')
source = '/tmp/foo.tar.gz'
mock_false = MagicMock(return_value=False)
mock_true = MagicMock(return_value=True)
state_single_mock = MagicMock(return_value={'local': {'result': True}})
@ -166,7 +167,7 @@ class ArchiveTestCase(TestCase, LoaderModuleMockMixin):
Tests the call of extraction with bsdtar
'''
bsdtar = MagicMock(return_value='tar (bsdtar)')
source = os.sep + os.path.join('tmp', 'foo.tar.gz')
source = '/tmp/foo.tar.gz'
mock_false = MagicMock(return_value=False)
mock_true = MagicMock(return_value=True)
state_single_mock = MagicMock(return_value={'local': {'result': True}})