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,472 Commits 24 Branches 182 Tags 341 MiB
1496e985f7
Commit Graph

7743 Commits

Author SHA1 Message Date
Daniel Wallace
1496e985f7
fix pylint 2018-04-04 15:13:59 -05:00
Daniel Wallace
75425dfd20
fix tests for localemod 2018-04-04 09:58:21 -05: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
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
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
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
5bf850c67f
File and Pillar roots are dictionaries 
Fixes test_smtp_return test cases.
 2018-03-23 11:42:14 -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
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
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
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
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
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
rallytime
b03cda3cea
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-20 09:13:13 -04:00
Erik Johnson
db304c3eff
Update tests to reflect changes to state returns 2018-03-19 15:18:49 -05:00
Nicole Thomas
e7dc802e2c
Merge branch '2018.3.0rc1' into optional_grains 2018-03-19 07:39:02 -04:00
Nicole Thomas
218b7f7a08
Merge pull request #46401 from garethgreenaway/46335_unicode_broke_the_x509_star 
[2018.3.0rc1] fixes to x509 module
 2018-03-16 13:57:53 -04:00
rallytime
8886b61576
Update old utils paths to new paths 2018-03-15 17:31:29 -04:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
twangboy
50a860b839
Remove unicode things 2018-03-15 12:55:26 -06:00
twangboy
8474006dab
Fix 2 tests 
Modifies the fibre_channel.py grain for linux to allow mocking. You
can't mock a file handle used in a for loop.
Fixes the mocking in test_windows_iscsi_iqn_grains. Apparently, you
can't stack multiple mocks in the same with statement.
 2018-03-15 11:15:57 -06:00
twangboy
5636ab7cd4
Fix some lint 2018-03-14 16:39:40 -06:00
twangboy
16949c0b93
Fix failing tests, add new tests 2018-03-14 16:37:42 -06:00
Erik Johnson
a8b1f0d640
Add unit test for salt-ssh edge case 2018-03-13 13:39:27 -05:00
Erik Johnson
4106840deb
user.present: don't change uid/gid unless explicitly told to 
Prior to this change, this state would update the uid/gid. This change
may have been accidental, and can cause problems with file ownership. A
uid/gid change must now be explicitly requested via two new arguments to
the `user.present` state.
 2018-03-12 19:30:47 -05:00
Nicole Thomas
7cdb00ca9c
Merge pull request #46398 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-03-12 16:25:18 -04:00
Nicole Thomas
b7191b8782
Merge pull request #46413 from meaksh/2017.7-explore-result-in-depth 
Explore 'module.run' state module output in depth to catch "result" properly
 2018-03-12 14:49:06 -04:00
Gareth J. Greenaway
08fce29653
Silly typo in test. 2018-03-10 06:23:00 -08:00
Gareth J. Greenaway
84d720b14c
Adding some code that was accidently reverted back in. 2018-03-10 06:21:47 -08:00
Gareth J. Greenaway
2c43911f62
Fixing lint. 2018-03-10 06:01:01 -08:00
Gareth J. Greenaway
e813b74fbe
Update test_x509.py 
Lint fixes.
 2018-03-10 06:01:00 -08:00
Gareth J. Greenaway
1d57787a6f
Gating the two tests that require m2crypto to be available. 2018-03-10 06:01:00 -08:00
Gareth J. Greenaway
70aca0da57
Recent unicode changes into Oxygen broke some aspects of the x509 module. When processing PEM text, it needs to be treated as ascii not unicode. Adding a couple tests for affected functions. 2018-03-10 06:01:00 -08:00
Nicole Thomas
cac096b311
Merge pull request #46434 from gtmanfred/highstate_return 
split return key value correctly
 2018-03-09 12:45:20 -05:00
Nicole Thomas
9c089aa4de
Merge pull request #46421 from bdrung/skip-ssh-tests-if-ssh-is-missing 
Skip SSHPasswordTests if ssh binary is not found
 2018-03-09 11:21:01 -05:00
Daniel Wallace
d18f1a55a7
fix pylint 2018-03-09 08:23:17 -07:00
Nicole Thomas
a188984cd9
Merge pull request #46446 from bdrung/fix-typos 
Fix various typos
 2018-03-08 16:11:46 -05:00
Daniel Wallace
9e2c3f7991
split return key value correctly 2018-03-08 13:38:52 -07:00