valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,231 Commits 24 Branches 182 Tags 341 MiB
e13216ba86
Commit Graph

94231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
e13216ba86
Mark output file permissions test as flaky 2018-08-29 11:36:24 -04:00
Daniel Wallace
1faf6a7ee4
Merge pull request #49356 from dwoz/cmdmod 
Fix tests that use timed_subprocess for py3
 2018-08-28 08:30:07 -05:00
Daniel A. Wozniak
6ffeaae19b
Fix tests that use timed_subprocess for py3 2018-08-28 00:03:38 -07:00
Erik Johnson
2d8055e151
Merge pull request #49336 from terminalmage/issue48299 
Fix half-baked comment
 2018-08-26 19:07:54 -05:00
Erik Johnson
175e161d9c
Fix half-baked comment 2018-08-26 19:06:14 -05:00
Daniel Wozniak
a2e7033f33
Merge pull request #49331 from dwoz/strfix 
Use salt.utils to ensure string type
 2018-08-25 18:42:07 -07:00
Daniel Wallace
d70eda8954
Merge pull request #49312 from Ch3LL/ssh_list_hosts 
Fix keyerror in manage.bootstrap
 2018-08-25 14:55:43 -05:00
Daniel Wallace
6b2eba7381
Merge pull request #49316 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.3 to 2018.3
 2018-08-25 14:53:04 -05:00
Daniel A Wozniak
7513474f71
Use salt.utils to ensure string type 2018-08-25 12:19:59 -07:00
Daniel Wozniak
5766e982e7
Merge pull request #49322 from dwoz/state_module_test_fix 
Encode shell commands explicitly.
 2018-08-24 21:43:26 -07:00
Daniel Wozniak
b47da0aff7
Merge pull request #49299 from dwoz/test_fix 
Work around cmd.run unicode issues in test for now
 2018-08-24 21:43:02 -07:00
Daniel A. Wozniak
1f7d50d194
Encode shell commands explicitly. 
On Windows subprocess.Popen will try to implicity encode shell commands
using the default system encoding. This will raise an exception if
passed utf-8.
 2018-08-24 14:27:02 -07:00
Daniel A. Wozniak
f4bd644a4b
Fix string formatting wart in file state tests 2018-08-24 12:09:37 -07:00
rallytime
39c442ca1c
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - salt/modules/file.py
  - tests/integration/states/test_file.py
 2018-08-24 14:08:30 -04:00
Nicole Thomas
7a89a4c8aa
Merge pull request #49311 from rallytime/bp-49303 
Back-port #49303 to 2018.3.3
 2018-08-24 13:48:23 -04:00
Daniel Wallace
b65890c363
Merge pull request #49305 from terminalmage/issue48299 
Allow git.latest to remove local tags which have been removed remotely
 2018-08-24 12:29:02 -05:00
Daniel Wallace
459354a6a3
Merge pull request #49308 from terminalmage/issue49009 
Don't include ignored paths in mtime map
 2018-08-24 12:28:41 -05:00
Nicole Thomas
914bb09667
Merge pull request #49282 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-24 12:45:49 -04:00
Ch3LL
da71c97073
Fix keyerror in manage.bootstrap 2018-08-24 10:58:10 -04:00
Daniel Wallace
3fe1387751
use os._exit instead of sys.exit when daemonizing 
According to the docs [here](https://docs.python.org/3/library/os.html#os._exit)

> `os._exit` should should normally only be used in the child process after a fork().

This will exit the process with status n, without calling cleanup
handlers, flushing stdio buffers, etc.

Fixes saltstack/salt-jenkins#1075
 2018-08-24 10:29:52 -04:00
Daniel Wallace
4c81c2ecf3
Merge pull request #49303 from gtmanfred/forking 
use os._exit instead of sys.exit when daemonizing
 2018-08-24 09:15:54 -05:00
rallytime
21a51c9336
Add 'minion_data_cache: True' to mocked opts for minions unit tests 2018-08-24 09:44:15 -04:00
Nicole Thomas
7bb356f11e
Merge pull request #49294 from Ch3LL/fed_28_tests 
Move run_function call from __init__ to setup
 2018-08-24 08:41:34 -04:00
Nicole Thomas
a607f9332f
Merge pull request #49302 from twangboy/fix_installer_2018.3.3 
Fix installer 2018.3.3
 2018-08-24 08:41:14 -04:00
Erik Johnson
2badd7f78f
Don't include ignored paths in mtime map 
Fixes #49009
 2018-08-24 07:10:39 -05:00
Erik Johnson
4a093d97fb
lint 2018-08-24 06:40:36 -05:00
Erik Johnson
ed7b99453c
Gate tag manipulation behind a sync_tags argument 2018-08-24 06:40:36 -05:00
Erik Johnson
29de855ede
Add test for a removed tag 2018-08-24 06:40:36 -05:00
Erik Johnson
eb9a4594b6
Properly handle tags deleted from remote repository 2018-08-24 06:40:36 -05:00
Erik Johnson
916c15a04d
Add git.tag function 2018-08-24 06:40:36 -05:00
Daniel A. Wozniak
e84e60857c
Fix wart in file state test 2018-08-23 21:00:35 -07:00
Daniel Wallace
e06ce49c1b
use os._exit instead of sys.exit when daemonizing 
According to the docs [here](https://docs.python.org/3/library/os.html#os._exit)

> `os._exit` should should normally only be used in the child process after a fork().

This will exit the process with status n, without calling cleanup
handlers, flushing stdio buffers, etc.

Fixes saltstack/salt-jenkins#1075
 2018-08-23 19:08:39 -05:00
twangboy
68fd37575e
Fix erroneous NSSM reference 2018-08-23 17:28:56 -06:00
twangboy
103f2c289e
Remove delete vcredist line 2018-08-23 17:24:38 -06:00
Daniel A. Wozniak
71d4465b6c
Work around cmd.run unicode issues in test for now 
Cat is missing on windows. I tired unsuccesfully to make this work with
the 'type' command on windows. This is maybe not ideal but it stablizes
the test suite for now.
 2018-08-23 16:21:20 -07:00
twangboy
007a16638e
Bring installer updates from 2017.7.8 to 2018.3.3 2018-08-23 17:13:53 -06:00
rallytime
196ce3f75e
Call the with_tempfile decorator correctly for 2018.3 2018-08-23 16:37:03 -04:00
rallytime
37f24fda78
Fix unit test for file state 
Chose the wrong side of a merge conflict resolution. This commit restores
the correct testing behavior.
 2018-08-23 16:18:29 -04:00
Ch3LL
0a5d44a3db
Move run_function call from __init__ to setup 2018-08-23 15:34:27 -04:00
Nicole Thomas
158c1ca575
Merge pull request #49276 from terminalmage/fix-moved-funcs 
Fix paths to moved functions
 2018-08-23 12:38:54 -04:00
Mike Place
ef39f85fac
Merge pull request #49270 from dwoz/test_event_fix 
Add async helper to test_sock_path_len
 2018-08-23 10:17:54 -06:00
rallytime
6f9a158661
Update old utils paths with new paths 2018-08-23 11:52:49 -04: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
Daniel Wallace
5da743adff
Merge pull request #49199 from jacobweinstock/fix-typeerror-unicode 
Fix typeerror unicode
 2018-08-23 09:38:16 -05:00
Nicole Thomas
e28f8f1ae0
Merge pull request #49264 from gtmanfred/diskusage 
fix diskusage beacon
 2018-08-23 10:36:06 -04:00
Daniel Wallace
f6b2b93afe
Merge pull request #49253 from gtmanfred/vmware 
skip ID 7 for vmware hard drives
 2018-08-23 09:35:30 -05:00
Erik Johnson
322a988def
Fix paths to moved functions 2018-08-23 08:32:11 -05:00
Erik Johnson
2a2bd48d83
Merge pull request #49263 from terminalmage/issue49159 
Revert default value for ipv6 to None
 2018-08-23 08:02:12 -05:00
Daniel A. Wozniak
51bf79afd9
Add async helper to test_sock_path_len 
This test function is causing another test:

unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription

To fail with 'Async operation timed out after 5 seconds', Adding the
tornado Async test helper so that both tests pass.
 2018-08-22 14:49:34 -07:00
Daniel Wozniak
ec32428f9b
Merge pull request #49244 from dwoz/gitfs_fixes 
Test fixes: unit.fileserver.test_gitfs
 2018-08-22 13:19:41 -07:00