2013-11-27 11:19:24 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
2012-06-30 23:56:02 +00:00
|
|
|
# Import python libs
|
2014-11-21 19:05:13 +00:00
|
|
|
from __future__ import absolute_import
|
2012-07-01 06:31:01 +00:00
|
|
|
import getpass
|
2012-06-30 23:56:02 +00:00
|
|
|
import grp
|
2013-05-03 09:47:08 +00:00
|
|
|
import pwd
|
2012-06-30 23:56:02 +00:00
|
|
|
import os
|
2012-07-03 14:50:02 +00:00
|
|
|
import shutil
|
2012-06-30 23:56:02 +00:00
|
|
|
import sys
|
|
|
|
|
2013-06-24 22:53:59 +00:00
|
|
|
# Import Salt Testing libs
|
2017-04-03 16:04:09 +00:00
|
|
|
from tests.support.case import ModuleCase
|
2017-02-27 13:58:07 +00:00
|
|
|
from tests.support.unit import skipIf
|
2017-04-03 16:04:09 +00:00
|
|
|
from tests.support.paths import FILES, TMP
|
2016-08-02 21:06:15 +00:00
|
|
|
|
2013-06-27 11:04:26 +00:00
|
|
|
# Import salt libs
|
2017-07-18 16:31:01 +00:00
|
|
|
import salt.utils.files
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
import salt.utils.platform
|
2012-06-30 23:56:02 +00:00
|
|
|
|
|
|
|
|
2017-04-03 16:04:09 +00:00
|
|
|
class FileModuleTest(ModuleCase):
|
2012-06-30 23:56:02 +00:00
|
|
|
'''
|
|
|
|
Validate the file module
|
|
|
|
'''
|
|
|
|
def setUp(self):
|
2017-04-03 16:04:09 +00:00
|
|
|
self.myfile = os.path.join(TMP, 'myfile')
|
2017-07-18 16:31:01 +00:00
|
|
|
with salt.utils.files.fopen(self.myfile, 'w+') as fp:
|
2013-06-27 11:04:26 +00:00
|
|
|
fp.write('Hello\n')
|
2017-04-03 16:04:09 +00:00
|
|
|
self.mydir = os.path.join(TMP, 'mydir/isawesome')
|
2012-08-25 13:21:38 +00:00
|
|
|
if not os.path.isdir(self.mydir):
|
|
|
|
# left behind... Don't fail because of this!
|
|
|
|
os.makedirs(self.mydir)
|
2017-04-03 16:04:09 +00:00
|
|
|
self.mysymlink = os.path.join(TMP, 'mysymlink')
|
2012-11-22 11:13:49 +00:00
|
|
|
if os.path.islink(self.mysymlink):
|
|
|
|
os.remove(self.mysymlink)
|
|
|
|
os.symlink(self.myfile, self.mysymlink)
|
2017-04-03 16:04:09 +00:00
|
|
|
self.mybadsymlink = os.path.join(TMP, 'mybadsymlink')
|
2012-11-22 11:13:49 +00:00
|
|
|
if os.path.islink(self.mybadsymlink):
|
|
|
|
os.remove(self.mybadsymlink)
|
2013-05-01 23:06:17 +00:00
|
|
|
os.symlink('/nonexistentpath', self.mybadsymlink)
|
2012-06-30 23:56:02 +00:00
|
|
|
super(FileModuleTest, self).setUp()
|
|
|
|
|
|
|
|
def tearDown(self):
|
2013-11-10 15:36:39 +00:00
|
|
|
if os.path.isfile(self.myfile):
|
|
|
|
os.remove(self.myfile)
|
2012-11-22 11:13:49 +00:00
|
|
|
if os.path.islink(self.mysymlink):
|
|
|
|
os.remove(self.mysymlink)
|
|
|
|
if os.path.islink(self.mybadsymlink):
|
|
|
|
os.remove(self.mybadsymlink)
|
2012-07-03 14:50:02 +00:00
|
|
|
shutil.rmtree(self.mydir, ignore_errors=True)
|
2012-06-30 23:56:02 +00:00
|
|
|
super(FileModuleTest, self).tearDown()
|
|
|
|
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'No chgrp on Windows')
|
2012-07-01 00:33:34 +00:00
|
|
|
def test_chown(self):
|
2012-07-01 06:31:01 +00:00
|
|
|
user = getpass.getuser()
|
2012-07-01 00:33:34 +00:00
|
|
|
if sys.platform == 'darwin':
|
|
|
|
group = 'staff'
|
2014-09-04 08:23:59 +00:00
|
|
|
elif sys.platform.startswith(('linux', 'freebsd', 'openbsd')):
|
2013-05-03 09:47:08 +00:00
|
|
|
group = grp.getgrgid(pwd.getpwuid(os.getuid()).pw_gid).gr_name
|
2012-08-01 18:36:49 +00:00
|
|
|
ret = self.run_function('file.chown', arg=[self.myfile, user, group])
|
2012-07-01 00:33:34 +00:00
|
|
|
self.assertIsNone(ret)
|
|
|
|
fstat = os.stat(self.myfile)
|
2012-08-01 18:36:49 +00:00
|
|
|
self.assertEqual(fstat.st_uid, os.getuid())
|
|
|
|
self.assertEqual(fstat.st_gid, grp.getgrnam(group).gr_gid)
|
|
|
|
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'No chgrp on Windows')
|
2012-07-01 00:33:34 +00:00
|
|
|
def test_chown_no_user(self):
|
|
|
|
user = 'notanyuseriknow'
|
2013-05-03 09:47:08 +00:00
|
|
|
group = grp.getgrgid(pwd.getpwuid(os.getuid()).pw_gid).gr_name
|
2012-08-01 18:36:49 +00:00
|
|
|
ret = self.run_function('file.chown', arg=[self.myfile, user, group])
|
2012-07-01 00:33:34 +00:00
|
|
|
self.assertIn('not exist', ret)
|
|
|
|
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'No chgrp on Windows')
|
2012-07-01 00:33:34 +00:00
|
|
|
def test_chown_no_user_no_group(self):
|
|
|
|
user = 'notanyuseriknow'
|
|
|
|
group = 'notanygroupyoushoulduse'
|
2012-08-01 18:36:49 +00:00
|
|
|
ret = self.run_function('file.chown', arg=[self.myfile, user, group])
|
2012-07-01 00:33:34 +00:00
|
|
|
self.assertIn('Group does not exist', ret)
|
|
|
|
self.assertIn('User does not exist', ret)
|
|
|
|
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'No chgrp on Windows')
|
2012-07-01 00:33:34 +00:00
|
|
|
def test_chown_no_path(self):
|
2012-07-01 06:31:01 +00:00
|
|
|
user = getpass.getuser()
|
2012-07-01 00:33:34 +00:00
|
|
|
if sys.platform == 'darwin':
|
|
|
|
group = 'staff'
|
2014-09-04 08:23:59 +00:00
|
|
|
elif sys.platform.startswith(('linux', 'freebsd', 'openbsd')):
|
2013-05-03 09:47:08 +00:00
|
|
|
group = grp.getgrgid(pwd.getpwuid(os.getuid()).pw_gid).gr_name
|
2012-07-01 00:33:34 +00:00
|
|
|
ret = self.run_function('file.chown',
|
|
|
|
arg=['/tmp/nosuchfile', user, group])
|
|
|
|
self.assertIn('File not found', ret)
|
|
|
|
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'No chgrp on Windows')
|
2012-07-01 00:33:34 +00:00
|
|
|
def test_chown_noop(self):
|
|
|
|
user = ''
|
|
|
|
group = ''
|
2012-08-01 18:36:49 +00:00
|
|
|
ret = self.run_function('file.chown', arg=[self.myfile, user, group])
|
2012-07-01 00:33:34 +00:00
|
|
|
self.assertIsNone(ret)
|
|
|
|
fstat = os.stat(self.myfile)
|
2012-08-01 18:36:49 +00:00
|
|
|
self.assertEqual(fstat.st_uid, os.getuid())
|
|
|
|
self.assertEqual(fstat.st_gid, os.getgid())
|
|
|
|
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'No chgrp on Windows')
|
2012-06-30 23:56:02 +00:00
|
|
|
def test_chgrp(self):
|
|
|
|
if sys.platform == 'darwin':
|
|
|
|
group = 'everyone'
|
2014-09-04 08:23:59 +00:00
|
|
|
elif sys.platform.startswith(('linux', 'freebsd', 'openbsd')):
|
2013-05-03 09:47:08 +00:00
|
|
|
group = grp.getgrgid(pwd.getpwuid(os.getuid()).pw_gid).gr_name
|
2012-08-01 18:36:49 +00:00
|
|
|
ret = self.run_function('file.chgrp', arg=[self.myfile, group])
|
2012-06-30 23:56:02 +00:00
|
|
|
self.assertIsNone(ret)
|
|
|
|
fstat = os.stat(self.myfile)
|
2012-08-01 18:36:49 +00:00
|
|
|
self.assertEqual(fstat.st_gid, grp.getgrnam(group).gr_gid)
|
2012-07-01 00:33:34 +00:00
|
|
|
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'No chgrp on Windows')
|
2012-07-01 00:33:34 +00:00
|
|
|
def test_chgrp_failure(self):
|
|
|
|
group = 'thisgroupdoesntexist'
|
2012-08-01 18:36:49 +00:00
|
|
|
ret = self.run_function('file.chgrp', arg=[self.myfile, group])
|
2012-07-01 00:33:34 +00:00
|
|
|
self.assertIn('not exist', ret)
|
2012-07-03 14:50:02 +00:00
|
|
|
|
2012-10-17 18:06:17 +00:00
|
|
|
def test_patch(self):
|
|
|
|
if not self.run_function('cmd.has_exec', ['patch']):
|
|
|
|
self.skipTest('patch is not installed')
|
|
|
|
|
|
|
|
src_patch = os.path.join(
|
2017-04-03 16:04:09 +00:00
|
|
|
FILES, 'file', 'base', 'hello.patch')
|
|
|
|
src_file = os.path.join(TMP, 'src.txt')
|
2017-07-18 16:31:01 +00:00
|
|
|
with salt.utils.files.fopen(src_file, 'w+') as fp:
|
2013-06-27 11:04:26 +00:00
|
|
|
fp.write('Hello\n')
|
2012-10-17 18:06:17 +00:00
|
|
|
|
|
|
|
# dry-run should not modify src_file
|
|
|
|
ret = self.minion_run('file.patch', src_file, src_patch, dry_run=True)
|
|
|
|
assert ret['retcode'] == 0, repr(ret)
|
2017-07-18 16:31:01 +00:00
|
|
|
with salt.utils.files.fopen(src_file) as fp:
|
2012-10-17 18:06:17 +00:00
|
|
|
self.assertEqual(fp.read(), 'Hello\n')
|
|
|
|
|
|
|
|
ret = self.minion_run('file.patch', src_file, src_patch)
|
|
|
|
assert ret['retcode'] == 0, repr(ret)
|
2017-07-18 16:31:01 +00:00
|
|
|
with salt.utils.files.fopen(src_file) as fp:
|
2012-10-17 18:06:17 +00:00
|
|
|
self.assertEqual(fp.read(), 'Hello world\n')
|
|
|
|
|
2012-07-03 14:50:02 +00:00
|
|
|
def test_remove_file(self):
|
2013-11-10 15:36:11 +00:00
|
|
|
ret = self.run_function('file.remove', arg=[self.myfile])
|
2012-07-03 14:50:02 +00:00
|
|
|
self.assertTrue(ret)
|
|
|
|
|
|
|
|
def test_remove_dir(self):
|
2013-11-10 15:36:11 +00:00
|
|
|
ret = self.run_function('file.remove', arg=[self.mydir])
|
2012-07-03 14:50:02 +00:00
|
|
|
self.assertTrue(ret)
|
|
|
|
|
2012-11-22 11:13:49 +00:00
|
|
|
def test_remove_symlink(self):
|
2013-11-10 15:36:11 +00:00
|
|
|
ret = self.run_function('file.remove', arg=[self.mysymlink])
|
2012-11-22 11:13:49 +00:00
|
|
|
self.assertTrue(ret)
|
|
|
|
|
|
|
|
def test_remove_broken_symlink(self):
|
2013-11-10 15:36:11 +00:00
|
|
|
ret = self.run_function('file.remove', arg=[self.mybadsymlink])
|
2012-11-22 11:13:49 +00:00
|
|
|
self.assertTrue(ret)
|
|
|
|
|
2012-07-03 14:50:02 +00:00
|
|
|
def test_cannot_remove(self):
|
2013-11-10 15:30:42 +00:00
|
|
|
ret = self.run_function('file.remove', arg=['tty'])
|
2012-07-03 14:50:02 +00:00
|
|
|
self.assertEqual(
|
2015-06-29 18:27:22 +00:00
|
|
|
'ERROR executing \'file.remove\': File path must be absolute: tty', ret
|
2012-08-01 18:36:49 +00:00
|
|
|
)
|
2012-07-20 06:21:01 +00:00
|
|
|
|
2013-06-30 13:19:16 +00:00
|
|
|
def test_source_list_for_single_file_returns_unchanged(self):
|
|
|
|
ret = self.run_function('file.source_list', ['salt://http/httpd.conf',
|
|
|
|
'filehash', 'base'])
|
Python 3 Fixes (Pt. 2) (#39397)
* Typo in comment
* First convert to string if not already a string. Then to bytes under Py3.
The reason being that jids from the CLI, at least the one fed in
integration.runners.jobs.ManageTest.test_loopup_jid is loaded as an
integer, and, while the Py2 code converts JIDs to strings, under Py3, we
assume JID's are already strings.
* Mark tests which require root permissions to run
* Allow declaring that the function IS a class method.
```
Python 3.5.3 (default, Jan 21 2017, 00:29:12)
[GCC 6.3.1 20170109] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> class Foo:
... def bar(self):
... print('bar')
...
>>> import inspect
>>> inspect.ismethod(Foo.bar)
False
>>> inspect.ismethod(Foo().bar)
True
```
On Python 2, `inspect.ismethod` returns `True` for bound and unbound
methods while on Python 3 it only returns `True` for bound methods.
The explicit `is_class_method` is to avoid instantiating the class just
to get the function signature.
* Always decode responses to the Python version native string implementation
* Just compare the objects as matching list.
Asserting same item count doesn't make that much sense.
* Py3 compatibility
* Fix saltnado tests under Py3
* Python 3 compatibility
* Show me the full traceback
* Revert "Convert fileserver data from bytes to strings"
This reverts commit e53972f8c6464c0fdeffb875c785b3ce530c7c5e.
* Revert "Under Py3, we get `bytes` when using the roots backend directly"
This reverts commit 9f73b240c1d68d785a04d898fab84837c154a5ae.
* Convert from bytes to str if not a binary file
* Py3 compatibility fixes.
Convert file contents from bytes to string if not a binary file
2017-02-14 23:20:56 +00:00
|
|
|
self.assertEqual(list(ret), ['salt://http/httpd.conf', 'filehash'])
|
2013-06-30 13:19:16 +00:00
|
|
|
|
2015-11-17 23:29:46 +00:00
|
|
|
def test_source_list_for_single_local_file_slash_returns_unchanged(self):
|
|
|
|
ret = self.run_function('file.source_list', [self.myfile,
|
|
|
|
'filehash', 'base'])
|
Python 3 Fixes (Pt. 2) (#39397)
* Typo in comment
* First convert to string if not already a string. Then to bytes under Py3.
The reason being that jids from the CLI, at least the one fed in
integration.runners.jobs.ManageTest.test_loopup_jid is loaded as an
integer, and, while the Py2 code converts JIDs to strings, under Py3, we
assume JID's are already strings.
* Mark tests which require root permissions to run
* Allow declaring that the function IS a class method.
```
Python 3.5.3 (default, Jan 21 2017, 00:29:12)
[GCC 6.3.1 20170109] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> class Foo:
... def bar(self):
... print('bar')
...
>>> import inspect
>>> inspect.ismethod(Foo.bar)
False
>>> inspect.ismethod(Foo().bar)
True
```
On Python 2, `inspect.ismethod` returns `True` for bound and unbound
methods while on Python 3 it only returns `True` for bound methods.
The explicit `is_class_method` is to avoid instantiating the class just
to get the function signature.
* Always decode responses to the Python version native string implementation
* Just compare the objects as matching list.
Asserting same item count doesn't make that much sense.
* Py3 compatibility
* Fix saltnado tests under Py3
* Python 3 compatibility
* Show me the full traceback
* Revert "Convert fileserver data from bytes to strings"
This reverts commit e53972f8c6464c0fdeffb875c785b3ce530c7c5e.
* Revert "Under Py3, we get `bytes` when using the roots backend directly"
This reverts commit 9f73b240c1d68d785a04d898fab84837c154a5ae.
* Convert from bytes to str if not a binary file
* Py3 compatibility fixes.
Convert file contents from bytes to string if not a binary file
2017-02-14 23:20:56 +00:00
|
|
|
self.assertEqual(list(ret), [self.myfile, 'filehash'])
|
2015-11-17 23:29:46 +00:00
|
|
|
|
|
|
|
def test_source_list_for_single_local_file_proto_returns_unchanged(self):
|
|
|
|
ret = self.run_function('file.source_list', ['file://' + self.myfile,
|
|
|
|
'filehash', 'base'])
|
Python 3 Fixes (Pt. 2) (#39397)
* Typo in comment
* First convert to string if not already a string. Then to bytes under Py3.
The reason being that jids from the CLI, at least the one fed in
integration.runners.jobs.ManageTest.test_loopup_jid is loaded as an
integer, and, while the Py2 code converts JIDs to strings, under Py3, we
assume JID's are already strings.
* Mark tests which require root permissions to run
* Allow declaring that the function IS a class method.
```
Python 3.5.3 (default, Jan 21 2017, 00:29:12)
[GCC 6.3.1 20170109] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> class Foo:
... def bar(self):
... print('bar')
...
>>> import inspect
>>> inspect.ismethod(Foo.bar)
False
>>> inspect.ismethod(Foo().bar)
True
```
On Python 2, `inspect.ismethod` returns `True` for bound and unbound
methods while on Python 3 it only returns `True` for bound methods.
The explicit `is_class_method` is to avoid instantiating the class just
to get the function signature.
* Always decode responses to the Python version native string implementation
* Just compare the objects as matching list.
Asserting same item count doesn't make that much sense.
* Py3 compatibility
* Fix saltnado tests under Py3
* Python 3 compatibility
* Show me the full traceback
* Revert "Convert fileserver data from bytes to strings"
This reverts commit e53972f8c6464c0fdeffb875c785b3ce530c7c5e.
* Revert "Under Py3, we get `bytes` when using the roots backend directly"
This reverts commit 9f73b240c1d68d785a04d898fab84837c154a5ae.
* Convert from bytes to str if not a binary file
* Py3 compatibility fixes.
Convert file contents from bytes to string if not a binary file
2017-02-14 23:20:56 +00:00
|
|
|
self.assertEqual(list(ret), ['file://' + self.myfile, 'filehash'])
|