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
95,272 Commits 24 Branches 182 Tags 341 MiB
7f77bfef99
Commit Graph

696 Commits

Author SHA1 Message Date
rallytime
f23852207f
Fix matcher grain file 
This was inadvertently changed in th filename_map backport.

This commit restores the matcher grain file to match all branches previous
to the inadvertent change.
 2018-10-30 09:51:51 -04:00
Nicole Thomas
f7c2f04574
Merge pull request #50182 from terminalmage/issue50050 
Backport runtests.py modifications from develop to 2018.3
 2018-10-29 12:25:06 -04:00
rallytime
113d76e045
Revert "Move jinja templating tests alongside salt/utils/jinja.py's tests" 
This reverts commit 6d9c2eb6b0.
 2018-10-29 11:05:33 -04:00
Daniel A. Wozniak
b77db48d77
Fix test_managed_file_with_grains_data on Windows 2018-10-23 22:58:09 -07:00
Erik Johnson
f2e55128bb
Evan Moar Lint 2018-10-23 14:48:32 -05:00
Erik Johnson
39c245525f
Lint 2018-10-23 14:48:31 -05:00
Erik Johnson
85b96de009
Rename some files to avoid them being identified as test modules 2018-10-23 14:41:06 -05:00
Erik Johnson
6d9c2eb6b0
Move jinja templating tests alongside salt/utils/jinja.py's tests 2018-10-23 14:28:45 -05:00
Erik Johnson
c5593bc843
Rename custom_grains.py so it's not identified as a test module 2018-10-23 14:22:07 -05:00
rallytime
a65c60d862
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/state.py
  - salt/utils/hashutils.py
  - tests/integration/modules/test_state.py
 2018-10-02 15:09:51 -04:00
Mike Place
b7d904f4bb
Merge branch '2018.3' into issue-49043 2018-09-30 09:18:54 -05:00
Erik Johnson
b3e9678fd9
Fix parallel states with long ID dec or name 
The cache files used for these are based on the state's tag, so longer
ID decs or names will cause errors when the filename's length exceeds
the max allowed by the kernel.

This fixes these errors by taking (up to) the first 32 chars of the
result of base64-encoding the tag, and using that as the parallel cache
filename.
 2018-09-26 14:50:35 -05:00
Daniel Wallace
cf5c179fd9
fix test_managed_file_with_grains_data 
Closes saltstack/salt-jenkins#1121
 2018-09-26 14:49:23 -05:00
Daniel A Wozniak
2a901e960d
Fix issue 49043 2018-09-25 23:27:28 -07:00
Daniel A. Wozniak
ca1b05e36d
Fix multiple issues in x509 module and state 
Adding a regression test for #49008 and patching the x509 module and
state to make the test pass.
 2018-09-11 08:47:50 -07:00
Daniel A. Wozniak
e603e7a4f2
Fix encoding issues in file and x509 states 2018-09-11 08:47:50 -07:00
Daniel A. Wozniak
10ec8beb39
Fix linter issues 2018-09-10 10:00:25 -07:00
Daniel A Wozniak
ccbcb5588a
Add more tests to whitelist for Windows 2018-09-10 09:34:27 -07:00
rallytime
c3ecefc785
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - salt/modules/win_service.py
  - salt/states/mount.py
  - salt/states/service.py
  - tests/integration/__init__.py
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py
 2018-08-23 11:50:41 -04:00
Mike Place
6fb8d4a33f
Merge pull request #49056 from Ch3LL/test_mine 
Add orch runner with mine.get integration tests
 2018-08-18 08:54:47 -04:00
Erik Johnson
8bda1e5ae3
Merge pull request #49091 from terminalmage/rename-test-files 
Rename/re-organize test files in 2018.3 branch
 2018-08-17 07:26:43 -05:00
Ch3LL
d2e73cc988
Remove -Z script_arg for cloud tests 2018-08-15 17:35:23 -04:00
Ch3LL
b4e421c3d6
Add orch runner with mine.get integration tests 2018-08-15 13:16:26 -04:00
Erik Johnson
ec258e235d
Add integration tests for yaml and json filters 2018-08-14 17:02:17 -05:00
Erik Johnson
613f0611f8
Lint 2018-08-14 13:53:31 -05:00
Erik Johnson
d51748eea2
Rename some files to avoid them being identified as test modules 2018-08-14 13:53:30 -05:00
Erik Johnson
b03a56355b
Move jinja templating tests alongside salt/utils/jinja.py's tests 2018-08-14 13:53:29 -05:00
Daniel Wallace
4386a9ca1f
Merge branch '2018.3' into isbm-python37-support-2018.3 2018-08-10 15:47:12 -05:00
Daniel Wallace
7b168a5aac
disable enable_ssh_minions to see if it is slowing down 2018.3 tests 2018-08-10 09:03:35 -05:00
Bo Maryniuk
b7da571624 Fix imports 2018-08-10 15:52:01 +02:00
Erik Johnson
726dd4331f
Add integration test for latin-1 file diffs 2018-08-03 17:30:17 -05:00
Daniel Wozniak
69f81214d1
Merge pull request #48714 from dwoz/state_echo_fix 
Always transfer bytes from fileserver roots
 2018-07-30 15:37:12 -07:00
Erik Johnson
b6f73e8e57
Remove trailing whitespace on what should be a blank line 2018-07-27 09:15:05 -05:00
Nicole Thomas
f2ef2d3ef6
Merge pull request #48752 from garethgreenaway/fix_state_file_all_integers 
[2018.3] Fix when state file is integers
 2018-07-25 11:03:01 -04:00
Gareth J. Greenaway
790801c67e
Fixing a case where the state module would fail if the state file being passed was all integers. Added a new tests for this edge case. 2018-07-24 14:00:37 -07:00
Daniel A Wozniak
aa34a80997
Always trasfer bytes from fileserver roots 
Fixes a state test on windows (py3) where utf-8 data was getting
improperly decoded before fileserver sends the data to a client.
 2018-07-23 09:43:45 -07:00
rallytime
e740d3b208
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/client/ssh/wrapper/state.py
  - salt/modules/dockermod.py
  - salt/modules/npm.py
  - salt/modules/testinframod.py
  - tests/integration/modules/test_mac_system.py
  - tests/integration/modules/test_mac_timezone.py
  - tests/integration/ssh/test_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_npm.py
  - tests/unit/states/test_file.py
 2018-07-23 11:15:43 -04:00
Ch3LL
70e36764ee
Add more tests for salt-ssh state.sls_id 2018-07-12 12:16:33 -04:00
rallytime
3e59dda0b1
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-07-03 16:09:28 -04:00
rallytime
4c691ac57a
Add regression test for Issue #48230 
This also tests the fix for issue #38914
 2018-07-02 16:56:49 -04:00
Erik Johnson
2c64b270df
Add timestamp to the minion's log_fmt_console 
This makes salt-call show timestamps in stdout/stderr when run from
integration tests (e.g. in ShellCase.run_script).
 2018-06-18 00:16:02 -05:00
Max Arnold
3d4fcbe3aa Add test for issue #48145 2018-06-15 23:48:14 +07:00
rallytime
3d2ea16c3a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/base.txt
  - salt/states/archive.py
  - salt/states/file.py
  - tests/integration/runners/test_state.py
  - tests/unit/daemons/test_masterapi.py
 2018-06-11 11:45:37 -04:00
Nicole Thomas
42dd6b83eb
Merge pull request #47978 from twangboy/fix_test_pkg 
Add try/finally, fix typo in 7zip def file
 2018-06-06 15:06:03 -04:00
Gareth J. Greenaway
7b7fb1f5d5
Adding missing test sls file. 2018-06-06 09:00:42 -07:00
twangboy
8bb36b3a4b
Add try/finally, fix typo in 7zip def file 2018-06-05 13:29:49 -06:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Nicole Thomas
b4bac9b41b
Merge pull request #47868 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-30 17:20:37 -04:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/win_snmp.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_pkg.py
  - tests/support/helpers.py
  - tests/support/runtests.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/whitelist.txt
 2018-05-29 11:14:39 -04:00