valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,567 Commits 24 Branches 182 Tags 341 MiB
67894e3ee9
Commit Graph

7772 Commits

Author SHA1 Message Date
Nicole Thomas
67894e3ee9
Merge pull request #46869 from gtmanfred/2018.3 
Always return dictionary for _localectl_status
 2018-04-05 09:25:13 -04:00
Nicole Thomas
d7e4b9d755
Merge pull request #46729 from terminalmage/expr_match 
Performance improvement/error catching in expr_match
 2018-04-04 16:25:56 -04:00
Daniel Wallace
1496e985f7
fix pylint 2018-04-04 15:13:59 -05:00
Nicole Thomas
e0b383afb5
Merge pull request #46872 from terminalmage/bp-46863 
Backport #46863 to 2018.3
 2018-04-04 15:04:39 -04:00
Erik Johnson
be284e5b99
Add skipIf when older mock present 2018-04-04 10:54:47 -05:00
Erik Johnson
db8faaee56
Add unit tests for ext_nodes master_tops module 2018-04-04 10:53:08 -05:00
Daniel Wallace
75425dfd20
fix tests for localemod 2018-04-04 09:58:21 -05:00
rallytime
4ad50bbdee
Update old utils paths to new paths 2018-04-03 14:46:56 -04:00
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/conf.py
  - salt/loader.py
  - salt/modules/dockermod.py
  - salt/modules/sensehat.py
  - salt/utils/parsers.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_cp.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/spm/test_man_spm.py
  - tests/integration/states/test_npm.py
  - tests/unit/states/test_environ.py
 2018-04-03 14:33:11 -04:00
Nicole Thomas
ebf5dd276f
Merge pull request #46783 from twangboy/fix_46680 
Fix network.managed test=True on Windows
 2018-04-03 08:54:55 -04:00
Nicole Thomas
df26f2641e
Merge pull request #46675 from dwoz/inspectlib-tests 
Skip test when git symlinks are not configured
 2018-04-03 08:19:18 -04:00
twangboy
da5ce25ef3
Fix unit tests on Linux 2018-04-02 19:59:13 -06:00
Daniel A. Wozniak
d39f4852d8
Handle non-zero status exception 2018-03-29 14:39:40 -07:00
Daniel A. Wozniak
83c005802b
Handle cases where git can not be found 
Signed-off-by: Daniel A. Wozniak <dwozniak@saltstack.com>
 2018-03-29 14:39:29 -07:00
Nicole Thomas
395b7f8fdc
Merge pull request #46655 from dwoz/pyobjects-46350 
Fixing cleanUp method to restore environment
 2018-03-29 14:31:47 -04:00
Nicole Thomas
af45c49c42
Merge pull request #46632 from dwoz/file-recurse-36802 
Fix file.recurse w/ clean=True #36802
 2018-03-29 14:30:41 -04:00
Daniel A. Wozniak
44db77ae79
Fix lint errors and typo 2018-03-28 21:06:34 -07:00
Daniel A. Wozniak
5aabd442f2
Fix up import and docstring syntax 2018-03-28 20:54:35 -07:00
Erik Johnson
70cfafe299
Add test case 2018-03-28 13:48:44 -05:00
Nicole Thomas
14ab50d3f4
Merge pull request #46696 from dwoz/win_test_client 
Windows `unit.test_client` fixes
 2018-03-28 13:55:46 -04:00
Daniel A. Wozniak
62d64c9230
Fix missing import 2018-03-27 14:10:24 -07:00
rallytime
d0278345fc
Update old utils paths to new utils paths 2018-03-27 16:45:16 -04:00
rallytime
e312efb5e7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00
Daniel A. Wozniak
18b1730320
Skip test that requires pywin32 on *nix platforms 2018-03-27 11:38:20 -07:00
Daniel A. Wozniak
ec4634fc06
Better explanation in doc strings 2018-03-27 10:35:51 -07:00
rallytime
00d4eb26f3
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
 2018-03-27 11:41:56 -04:00
Nicole Thomas
3f21e9cc65
Merge pull request #46503 from psyer/fix-cmd-run-env-corrupt 
Fixes stdout user environment corruption
 2018-03-27 10:20:14 -04:00
Gareth J. Greenaway
042930bd3b
A couple more fixes to ensure everything works consistently under python2 and python3, adjusting things that should be bytes and things that should be strings. Updating tests to reflect changes. 2018-03-26 21:51:51 -07:00
Nicole Thomas
0faced1d54
Merge pull request #46565 from twangboy/win_fix_cmd_powershell_2018.3 
Create reg salt util (2018.3)
 2018-03-26 18:03:33 -04:00
twangboy
5ee64e9b0e
Fix lint (spelling error) 2018-03-26 13:02:53 -06:00
Daniel A. Wozniak
45dce1a485
Add reg module to globals 2018-03-26 12:00:39 -07:00
Nicole Thomas
fadc5e4ba4
Merge pull request #46669 from terminalmage/pillar-merge-order 
Add option to return to pre-2017.7.3 pillar include merge order
 2018-03-26 15:00:27 -04:00
Daniel A. Wozniak
d9ae2abb34
Fix splling in docstring 2018-03-26 09:45:04 -07:00
Nicole Thomas
6c80d90bb6
Merge pull request #46693 from dwoz/test_smtp_return 
File and Pillar roots are dictionaries
 2018-03-26 11:15:37 -04:00
Nicole Thomas
47409eaa6e
Merge pull request #46646 from twangboy/win_fix_test_local_cache 
Fix `unit.returners.test_local_cache` for Windows
 2018-03-26 10:16:22 -04:00
Daniel A Wozniak
b40efc5db8
Windows test client fixes 
- Skip IPC transport test on windows
- Add TCP transport test for windows
 2018-03-23 15:36:32 -07:00
Daniel A. Wozniak
5bf850c67f
File and Pillar roots are dictionaries 
Fixes test_smtp_return test cases.
 2018-03-23 11:42:14 -07: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
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
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
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
Michael Calmer
af64632bf3 add unit test for failed login 2018-03-22 08:57:16 +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
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