valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,694 Commits 24 Branches 182 Tags 341 MiB
82e17e5fc8
Commit Graph

91694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Karol Dąbkowski
52581e7918
Removed trailing whitespace 2018-03-23 09:28:07 +01:00
Daniel Ferenci
6d5b2068aa
Merge branch '2017.7' into fix-add-saltenv-pillarenv-to-pillar-item 2018-03-23 08:35:44 +01:00
Daniel A Wozniak
628b87d5c4
Skip test when git symlinks are not configured 2018-03-22 23:30:15 -07:00
twangboy
0de54ed953
Additional tests 
Adds additional tests for unicode scenarios
Fixes an issue with reg.py when deleting unicode keys
Puts the destructive tests in a try/except block so the delete occurs no
matter what
Uses a randomly generated key name for testing
 2018-03-22 15:59:46 -06:00
Daniel A. Wozniak
9f95c50061
Use default SLS encoding, fall back to system encoding 2018-03-22 14:43:43 -07:00
twangboy
6548d550d0
Use salt.utils.to_unicode 2018-03-22 14:43:07 -07:00
twangboy
8c0164fb63
Add ability to specify encoding in sdecode 2018-03-22 14:43:00 -07:00
twangboy
2e7985a81c
Default to utf-8 on Windows 
If it fails, we'll fall back to the system codepage
 2018-03-22 14:42:45 -07:00
Daniel A. Wozniak
73d06f664b Fix linter error 2018-03-22 13:47:41 -07:00
twangboy
fc9ecd75e2
Skip unit.state.test_reg unless on Windows 2018-03-22 14:29:35 -06:00
twangboy
aa98bdf250
Fix some lint 2018-03-22 14:29:35 -06:00
twangboy
e0d201a96f
Make sure the docs are correct for the tests 2018-03-22 14:29:34 -06:00
twangboy
f15f92318d
Add tests for salt.utils.win_reg 
Fix some issues found in testing
 2018-03-22 14:29:34 -06:00
twangboy
f7112b19a2
Submit #46527 agains 2018.3 2018-03-22 14:29:33 -06:00
twangboy
77439948cc
Bring #46310 into 2018.3.0rc1 2018-03-22 13:27:14 -06:00
Karol Dabkowski
123a86947c Chocolatey - Added lowering local packages for unifing both local and remote names to lowercase for comparison. 2018-03-22 19:37:37 +01:00
Erik Johnson
b4a1d34b47
Add option to return to pre-2017.7.3 pillar include merge order 
https://github.com/saltstack/salt/pull/45025 changed the pillar include
merge order. This adds a new config option which allows a user to revert
to the pre-2017.7.3 behavior.
 2018-03-22 13:35:12 -05:00
Daniel A. Wozniak
009a8f56ea
Fix up environ state tests for Windows 2018-03-22 11:31:25 -07:00
Michael Calmer
3ceb63f607 fix checking test results 2018-03-22 16:31:46 +01:00
Gareth J. Greenaway
8bb949d31c
Merge pull request #46652 from Ch3LL/openstack_ip 
openstack: fix keyword arg for __query_node()
 2018-03-22 08:15:29 -07:00
Erik Johnson
986c7bcdae
Rewrite unicode/py3 section 2018-03-22 09:39:06 -05:00
Karol Dabkowski
4be1a991c2 Lowered name of available packages before comparing with local packages 2018-03-22 12:13:19 +01:00
Michael Calmer
af64632bf3 add unit test for failed login 2018-03-22 08:57:16 +01:00
Michael Calmer
0fc7989236 make it possible to use login, pull and push from module.run and detect errors 
when using state.apply module.run doing docker operations retcode
is tracked to find out if the call was successful or not.
 2018-03-22 08:56:58 +01:00
Daniel A. Wozniak
b4be10b8fc
Fixing cleanUp method to restore environment 
The clean-up method was not reliabliy restoring sys.environment on
windows. Using Mock's patch to cleanup more reliably.
 2018-03-21 20:01:30 -07:00
Mike Place
2e1f7c37f7
Merge pull request #46569 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-03-21 20:57:04 +00:00
Ch3LL
95c572d577
openstack: fix keyword arg for __query_node() 2018-03-21 16:39:18 -04:00
Mike Place
4e7466a21c
Merge pull request #46588 from UtahDave/no_crash_winshell 
Don't crash when saltwinshell is missing
 2018-03-21 20:26:30 +00:00
Daniel Ferenci
5219377313
Merge branch '2017.7' into fix-add-saltenv-pillarenv-to-pillar-item 2018-03-21 20:24:28 +01:00
Mike Place
33af3cfc7c
Merge pull request #46631 from rallytime/update-pillar-unit-tests 
Fix pillar unit test failures: file_roots and pillar_roots environments should be lists
 2018-03-21 19:22:48 +00:00
Ch3LL
9fef8bc431
Mirror libnacl imports in test from the nacl runner 2018-03-21 15:18:58 -04:00
Mike Place
d329e7af78
Merge pull request #46640 from terminalmage/file.copy-docs 
Clarify the docs for the file.copy state
 2018-03-21 19:14:49 +00:00
Mike Place
ff40590c06
Merge pull request #46642 from vutny/doc-cloud-index 
[DOC] Unify cloud modules index header
 2018-03-21 19:13:28 +00:00
Ch3LL
f11d58a8e9
Mirror libnacl imports in test from the nacl module 2018-03-21 15:10:46 -04:00
Erik Johnson
e82a1aa1ec
Make server_id consistent on Python 3 
Hashing is randomized using a random seed on Python >= 3.3. This causes
the server_id grain (which uses hash), to be inconsistent. To solve
this, on Python >= 3.3 we now must shell out to Python with the
PYTHONHASHSEED variable set to 0 to get a consistent hash for this
grain.
 2018-03-21 13:36:58 -05:00
Erik Johnson
064bc83276
Add Unicode / Python 3 update to 2018.3.0 release notes 2018-03-21 12:40:10 -05:00
twangboy
c179388b0e
Fix the tear down function in integration.modules.test_grains.GrainsAppendTestCase 
Fix the tear down function to just set the grain to an empty list instead of
removing each individual item
 2018-03-21 16:37:10 +00:00
twangboy
8d93156604
Fix unit.returners.test_local_cache for Windows 
time.time is only precise to 3 decimal places in Windows. This adds a
sleep for .25 seconds to allow the test to pass
Also fixes a lint error
 2018-03-21 16:00:52 +00:00
Denys Havrysh
51e6aa54a1
[DOC] Unify cloud modules index header 2018-03-21 17:17:28 +02:00
Erik Johnson
480c5f8faa
Clarify the docs for the file.copy state 2018-03-21 09:04:54 -05:00
Erik Johnson
2f7660fe35
Use the correct path for nacl certificates in Windows 2018-03-21 08:13:11 -05:00
Daniel Ferenci
b7d39caa86
Merge branch '2017.7' into fix-add-saltenv-pillarenv-to-pillar-item 2018-03-21 08:45:18 +01:00
GLOBAL\i039818
25f1074a85 Add docstring for added parameters 2018-03-21 08:44:27 +01:00
Erik Johnson
e8582e80f2
Python 3-compatibility fix to unit test 
This should not be returning a string type for stderr, since
Popen.communicate() returns a bytestring. In Python 2, the str and bytes
types are the same, but the same is not true in Python 3.

Additionally, the mocking here seems not to consider the fact that Popen
is called when runas is used to get the runas user's environment. Since
this test doesn't care about the output, we can just make the mocked
Popen.communicate() return an empty bytestring.
 2018-03-20 22:09:18 -05:00
David Boucha
b7842a1777 Update error message. 2018-03-20 18:31:43 -06:00
David Boucha
95dfdb91ca Don't stacktrace when salt-ssh w/o saltwinshell 2018-03-20 18:31:43 -06:00
Daniel A. Wozniak
eb822f5a12
Fix file.recurse w/ clean=True #36802 
Fix an endless looping but in file.recurse when clean is set to true.
This patch normalizes paths and handles the root correctly.
 2018-03-20 16:12:01 -07:00
Nicole Thomas
8cdd56b9dc
Merge pull request #46620 from rallytime/merge-2018.3.0rc1-into-2018.3 
[2018.3] Merge 2018.3.0rc1 into 2018.3
 2018-03-20 18:45:00 -04:00
rallytime
0f728186aa
Fix pillar unit test failures: file_roots and pillar_roots environments should be lists 2018-03-20 17:49:58 -04:00
rallytime
46ba72fb1c
Fix pillar unit test failures: file_roots and pillar_roots environments should be lists 2018-03-20 17:32:21 -04:00