Commit Graph

101651 Commits

Author SHA1 Message Date
Bryce Larson
9a3358259b
Merge branch '2019.2.1' into tcp_leak 2019-06-25 14:23:03 -06:00
Pedro Algarvio
f5687962a4
Merge pull request #53574 from s0undt3ch/hotfix/fix-nox-bypass-2019.2.1
[2019.2.1] Minor fixes/adjustments to the new CI pipelines
2019-06-25 19:48:24 +01:00
Pedro Algarvio
e85e2f4719
Minor fixes/adjustments to the new CI pipelines 2019-06-25 19:13:01 +01:00
Daniel Wozniak
77b7fc46b5
Merge pull request #53584 from dwoz/client_cache
Add unit tests for recent SaltCacheLoader changes
2019-06-24 16:40:42 -07:00
Daniel A. Wozniak
e9b61dc4db
Add unit tests for recent SaltCacheLoader changes 2019-06-24 18:22:15 +00:00
Daniel Wozniak
7eb5d41f37
Merge branch '2019.2.1' into tcp_leak 2019-06-23 16:12:14 -07:00
Gareth J. Greenaway
6ed6c31e4f
Merge pull request #53563 from twangboy/py3_windows_hang
SaltCacheLoader does not create multiple FileClients
2019-06-22 16:23:03 -07:00
twangboy
369720e660
Allow the file_client to be overridden 2019-06-21 17:48:27 -06:00
twangboy
f6c592c7a1
Don't instantiate the file_client every time 2019-06-21 16:17:40 -06:00
Megan Wilhite
c6069520f1
Merge pull request #53432 from garethgreenaway/2019_2_1_mac_fixes
[2019.2.1] Various fixes for 2019.2.1 to ensure tests pass on Mac OS X
2019-06-21 09:47:40 -04:00
Daniel A. Wozniak
481372b995 Fix torando loop thread issue 2019-06-21 01:35:05 +00:00
Gareth J. Greenaway
1974f110bc
Disabling a couple more tests in integration.modules.test_cp that hang on OS X and Py2. 2019-06-20 11:58:24 -07:00
Daniel A. Wozniak
aff15d4c04 Fix linter wart 2019-06-20 18:40:42 +00:00
Daniel A. Wozniak
9606db79fc Comment the tcp message client test better 2019-06-20 18:31:13 +00:00
Daniel A. Wozniak
dcf576f4c9 Add unit test for tcp message client close method 2019-06-20 18:24:53 +00:00
Daniel A. Wozniak
4420556fe4 Download artifacts for tcp jobs 2019-06-20 17:06:22 +00:00
Daniel A. Wozniak
e6a09dd634 Merge remote-tracking branch 'origin/tcp_leak' into tcp_leak 2019-06-20 16:56:25 +00:00
Daniel A. Wozniak
4a37234dcf Add tcp suffix to github notifications 2019-06-20 16:50:20 +00:00
Shane Lee
f484f3ff87
Merge branch '2019.2.1' into tcp_leak 2019-06-20 10:41:16 -06:00
Pedro Algarvio
59e2a1f053
Merge pull request #53526 from s0undt3ch/hotfix/fix-nox-bypass-2019.2.1
[2019.2.1] Update pipelines to work on old and new jenkins
2019-06-20 16:29:12 +01:00
Gareth J. Greenaway
7721151a12
Fixing lint. 2019-06-20 07:04:21 -07:00
Gareth J. Greenaway
1d4e228f15
Updating various skips for tests to only skip if OS is OS X and Python is Python2. 2019-06-20 07:04:21 -07:00
Gareth J. Greenaway
01dafdc6fc
Skipping integration.modules.test_cp.CPModuleTest.test_get_file_str_https on OS X 2019-06-20 07:04:21 -07:00
Gareth J. Greenaway
c02db20cb1
Disabling integration.modules.test_state.StateModuleTest.test_parallel_state_with_long_tag 2019-06-20 07:04:21 -07:00
Gareth J. Greenaway
87888778fe
Skip integration.states.test_file.FileTest.test_issue_11003_immutable_lazy_proxy_sum and
integration.states.test_pip_state.PipStateTest.test_22359_pip_installed_unless_does_not_trigger_warnings when running on OS X.
2019-06-20 07:04:21 -07:00
Gareth J. Greenaway
cf76027a43
Removing wrong import of skipIf 2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
b10e1e7c58
Moving the skipIf for OS X from the beacon state tests to the renderer state tests. 2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
d2fef9ac3f
Disabling beacon state tests on OS X for the time being. 2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
1741bb053b
Adding some timeouts to see if it helps the tests pass on OS X. 2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
fd0ba0aea9
Ensure the user and group used by @with_system_user_and_group are consistent. 2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
e03ab81b99
Using salt.utils.path.which to find false, on OSX it lives under /usr/bin/ 2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
353f9d4eb8
Fixing the beacons.reset function. Once the reset has taken place in beacons/__init__.py we need to fire an event back to complete the loop and ensure that everything worked as expected. 2019-06-20 07:04:20 -07:00
Gareth J. Greenaway
ee3cbc7ca5
fix to how the depends decorator works. Only run the dependancy commands for the module we're checking. 2019-06-20 07:04:19 -07:00
Gareth J. Greenaway
8440176992
Fixing a log issue that pops up after test_gen_thin_compression_fallback_py3 on "OS X, need to ensure that salt.utils.thin.os.close is mocked. 2019-06-20 07:04:19 -07:00
Gareth J. Greenaway
9767dddfbf
Format for the sqlite3 databse used for the assistive information changed in Mojave, additional columns added. 2019-06-20 07:04:19 -07:00
Gareth J. Greenaway
9c8a7e6a26
Fixing a bug when the roots fileserver and the location is a symlink to another location. This fix ensures that when fsroot is referenced we are using the real path and not the symlink path. 2019-06-20 07:04:15 -07:00
Megan Wilhite
f5f80af440
Merge pull request #53210 from Ch3LL/cp-52787
Cherry-Pick #52787 into 2019.2.1
2019-06-20 09:33:12 -04:00
Daniel A. Wozniak
4a2848bcf6
Add transport PR tests 2019-06-20 01:40:02 +00:00
Andrei Zene
9a4b407761
Fix leak of SaltMessageClient instances when using tcp transport 2019-06-20 01:39:59 +00:00
Megan Wilhite
f27c434029
Merge branch '2019.2.1' into cp-52787 2019-06-19 14:54:14 -04:00
Daniel Wozniak
fd6cb35093
Merge pull request #53467 from twangboy/fix_test_win_file
Check valid username first (fixes failing symlink test)
2019-06-19 10:04:29 -07:00
Megan Wilhite
32300788af
Merge pull request #53475 from Ch3LL/add_pypsexec
Add pypsexec requirement for cloud tests
2019-06-19 09:30:24 -04:00
Megan Wilhite
bdd7c2c571
Merge pull request #53491 from Ch3LL/crypt_test_mac
Update test_gen_hash for macosx
2019-06-19 09:16:02 -04:00
Megan Wilhite
8c2e95233d
Merge pull request #53494 from Ch3LL/do_cloud_test
Always delete digital ocean key for test_key_management test
2019-06-19 09:14:50 -04:00
Pedro Algarvio
24d6d094a1
Update pipelines to work on old and new jenkins 2019-06-19 12:46:32 +01:00
Gareth J. Greenaway
6b6dc66c15
Merge branch '2019.2.1' into cp-52787 2019-06-18 19:37:24 -07:00
Gareth J. Greenaway
85e96bd662
Merge branch '2019.2.1' into crypt_test_mac 2019-06-18 19:37:11 -07:00
Gareth J. Greenaway
2e3778b07f
Merge pull request #53434 from weswhet/patch-2
Update documentation for newer mac_service module.
2019-06-18 18:15:18 -07:00
Gareth J. Greenaway
92950c5fc2
Merge branch '2019.2.1' into fix_test_win_file 2019-06-18 17:11:59 -07:00
Gareth J. Greenaway
89398a9049
Update salt.modules.service.rst 2019-06-18 17:10:42 -07:00