Commit Graph

78272 Commits

Author SHA1 Message Date
Pedro Algarvio
e53972f8c6
Convert fileserver data from bytes to strings 2017-02-13 16:44:09 +00:00
William Giokas
0647dc8aab doc: Fix the Nix documentation (#39343) 2017-02-13 09:42:37 -07:00
Mike Place
41220e799f Merge pull request #39356 from cloudflare/table_out_fix
Fix table outputter opts
2017-02-13 09:27:06 -07:00
Pedro Algarvio
ff1667c6d6
We really don't need to decode the string prior to writing it to file.
Plus, this also avoids handling Py2 and Py3 differently.
2017-02-13 16:25:09 +00:00
Pedro Algarvio
89e67f0934
We need to feed bytes to the hash function under Py3 2017-02-13 16:19:02 +00:00
Mircea Ulinic
6539f4b86b Fix table outputter opts 2017-02-13 13:09:10 +00:00
Daniel Hobley
3a3ef25b51 Fix add beacon when there are no devices
- Changed the assumption that having 0 lines means there are no devices, to actually checking there are no devices
2017-02-13 13:33:52 +01:00
Morgan Willcock
ea6b7ed5af lint fixes 2017-02-13 11:00:01 +00:00
ninja-
94c62388e7 Reduce fileclient.get_file latency by merging _file_find and _file_hash
This commit uses the newly created _file_hash_and_stat master function.
This is especially useful if your master and minion servers are in another datacenter (in my case the ping latency between them is 10ms, which somehow makes it around 40ms to access full file metadata)
This time is now cut in half. Yay!
2017-02-13 11:56:32 +01:00
Pedro Algarvio
8e5a31f0d1
Use six.moves.StringIO 2017-02-13 10:18:58 +00:00
Pedro Algarvio
005f21d3b5
Compare against the normalized mode string 2017-02-13 10:18:58 +00:00
Pedro Algarvio
90d5968ebe
Python 3 compatibility 2017-02-13 10:18:58 +00:00
Pedro Algarvio
6b15e31f68
Convert bytes to string under python 3 2017-02-13 10:18:58 +00:00
Pedro Algarvio
c1b5606199
Handle bytes vs strings on the file state module tests 2017-02-13 10:18:57 +00:00
Pedro Algarvio
488a5e5089
Properly handle octal strings under Py3 2017-02-13 10:18:57 +00:00
Pedro Algarvio
26b17fb044
Make sure the minion sync's modules/states/grains/etc when starting 2017-02-13 10:18:57 +00:00
Pedro Algarvio
6e8e98fbf5
Avoid a recursion issue on Py3 when being deep copied 2017-02-13 10:18:57 +00:00
Pedro Algarvio
873ae4b57a
Under Py3, decode what's read, from bytes to strings 2017-02-13 10:18:57 +00:00
Pedro Algarvio
fe1c82ef1d
Under Py3, what we get from .read() is bytes.
Using `six.b()` in this particular case is all we need to do.
2017-02-13 10:18:56 +00:00
Pedro Algarvio
c0faa1ff13
Add 'syndic_log_file' to the keys to check 2017-02-13 10:18:56 +00:00
Pedro Algarvio
7b7133ea25
This test case requires root permissions 2017-02-13 10:18:56 +00:00
Pedro Algarvio
6a88d6f085
Only try to create a directory if dirname is not an empty string. 2017-02-13 10:18:56 +00:00
Pedro Algarvio
a878f89d9f
Provide a fallback class in case of import error 2017-02-13 10:18:56 +00:00
ninja
0f43fe652d Add _file_hash_and_stat master API function 2017-02-13 11:14:18 +01:00
Pedro Algarvio
8d581f5c41 Merge pull request #39348 from terminalmage/git_pillar-tests
Fix some test instability in develop
2017-02-13 09:23:59 +00:00
stein
a203de8919 函数分解 2017-02-13 16:23:17 +08:00
Erik Johnson
6ee6874e11 Set time back 1 week instead of up to 36 years in system module tests
This prevents git_pillar certificate errors. Additionally, sometimes
/dev/rtc becomes unresponsive which leads the ``hwclock --compare``
command to spin indefinitely, ultimately causing the entire test run to
fail. This changeset uses a SIGALRM handler to abort the hwclock command
if no output is seen within 3 seconds and try a second time. If it times
out the second time as well, then an error will be logged but it will
not be fatal to the test (or hang it indefinitely).
2017-02-12 23:57:28 -06:00
Erik Johnson
145f6fa786 Make log message more readable 2017-02-12 22:25:02 -06:00
Erik Johnson
ccfcf6867f Fix cwd for cleaning refs 2017-02-12 22:25:02 -06:00
Erik Johnson
64d1c19c0e Handle per-remote and global key types in enforce_types 2017-02-12 22:25:02 -06:00
Erik Johnson
4e577e697d Switch to non-legacy git_pillar syntax in test suite 2017-02-12 15:12:49 -06:00
markuskramerIgitt
b65f5fef49 Removing unused msi_conformant_version_assert() 2017-02-12 16:19:21 +01:00
markuskramerIgitt
8f2b7538a5 Using __saltstack_version__, thanks to @s0undt3ch 2017-02-12 16:08:27 +01:00
Pedro Algarvio
4f8edc36a2 Merge pull request #39340 from terminalmage/issue39334
Fix gpg renderer breakage from bef5e66
2017-02-12 12:20:31 +00:00
Erik Johnson
6653d98c5a Fix gpg renderer breakage from bef5e66
bef5e66 sought to make a PY3 compatibility change, but the attribute
from Python2's cStringIO module is not available via the "fake"
cStringIO which six exposes, as six's cStringIO is just the
cStringIO.StringIO function. The other cStringIO class attributes are
not available via six.

This commit adds a new module with a few functions to get information on
StringIO objects both in Python2 and 3, and modifies the files edited in
bef5e66 to use this new module to determine if the object is a readable
StringIO.

Fixes #39334.
2017-02-12 01:24:09 -06:00
stein
e80a29e058 repair name error 2017-02-12 10:43:29 +08:00
Morgan Willcock
c4a85c73aa Suggest use of shutdown states in-place of the shutdown modules 2017-02-11 21:22:27 +00:00
Morgan Willcock
6f1699d062 Add reboot and shutdown states to win_system 2017-02-11 20:56:53 +00:00
markuskramerIgitt
527b84e2e0 Revoking TODO "static version" 2017-02-11 16:11:05 +01:00
stein
73034da52e repair aliyun api problem 2017-02-11 22:56:13 +08:00
markuskramerIgitt
7164b9c437 TODO and quirk "missing commit", TODO "static version" 2017-02-11 14:32:09 +01:00
markuskramerIgitt
61215ab45d Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-02-11 12:03:09 +01:00
Michael Calmer
17521fb23c added unit test for dockerng.sls_build dryrun option (#39305) 2017-02-10 16:11:26 -07:00
bricewge
60c4c0dde4 fix #39318
don't try to switch users if you are already the right user
2017-02-10 18:28:04 +01:00
Nicole Thomas
050b4cc824 Protect hardware clock test comparison better (#39298)
In #39060, some tests were added to check for the hardware clock
getting reset when possible. The test attempted to gate the test
when access to the hardware clock was impossible, but the check
wasn't quite right and caused problems with the resulting tests.

This change makes the `has_settable_hwclock()` function public
in order to make the test gate work correctly. This function
could also be useful at the CLI level.

When running `self.run_function('status._has_settable_hwclock()')`
from the test suite, the return is a string noting that the
function is unavailable. This change allows for the `if not` check
to evaluate the return of the function.
2017-02-10 10:15:25 -07:00
Erik Johnson
954752b5fd Add test for __virtual_aliases__ 2017-02-10 08:48:57 -06:00
markuskramerIgitt
2a40840421 rst table requires + signs for column 2017-02-10 12:33:57 +01:00
markuskramerIgitt
7e25c637d9 wrong git branch 2017-02-10 12:29:13 +01:00
markuskramerIgitt
96958f4706 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-02-10 12:24:20 +01:00
markuskramerIgitt
6f165a954a rst table requires + signs for column 2017-02-10 12:20:34 +01:00