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
94,109 Commits 24 Branches 182 Tags 341 MiB
41a2586fc0
Commit Graph

94109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
41a2586fc0
Add file coding line at top of file 
This was accidentally removed during a merge conflict resolution
 2018-09-10 12:45:43 -04:00
Gareth J. Greenaway
7df3bebf53
Fixing lint. 2018-09-10 12:43:55 -04:00
Gareth J. Greenaway
5fee38d1db
Fixes various tests that were failing under python 3.7. 2018-09-10 12:43:55 -04:00
Gareth J. Greenaway
202da7a94f
Merge pull request #49550 from rallytime/bp-49548 
Back-port #49548 to 2018.3.3
 2018-09-06 17:36:04 -07:00
Gareth J. Greenaway
180692ccee
Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests. This PR is disabling the tests in the test_boto_vpc state tests. 2018-09-06 17:21:33 -04:00
Nicole Thomas
cae2d61568
Merge pull request #49542 from twangboy/fix_osx_build_3 
Update openssl
 2018-09-06 12:11:33 -04:00
twangboy
fe02b2276f
Add 1.0.2p shasum file 2018-09-06 10:08:46 -06:00
twangboy
5f06dc2762
Fix issues with osx build scripts on 2018.3.3 
Upgrade openssl to 1.0.2p
 2018-09-06 10:05:58 -06:00
Nicole Thomas
d9f09da5d9
Merge pull request #49536 from rallytime/bp-49524 
Back-port #49524 to 2018.3.3
 2018-09-06 12:00:00 -04:00
Nicole Thomas
cb934bf0b6
Merge pull request #49535 from Ch3LL/skip_pip_mac 
Skip test_virt and pip_state requirements tests on macosx
 2018-09-06 11:59:37 -04:00
Gareth J. Greenaway
9e7203e08a
Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests. 2018-09-06 09:36:35 -04:00
Ch3LL
50237e9daf
Skip test_virt and pip_state requirements tests on macosx 2018-09-05 17:49:07 -04:00
Nicole Thomas
87d3dfe085
Merge pull request #49499 from rallytime/pin-cherrypy-2018.3.3 
Pin CherryPy version to < 18.0.0 in requirements files for PY2
 2018-09-04 14:52:43 -04:00
rallytime
9e274335a3
Pin CherryPy version to < 18.0.0 in requirements files for PY2 
Version 18.0 now requires Python 3.5, so we need to pin this for Py2.
 2018-09-04 10:51:12 -04:00
Nicole Thomas
39fdacc434
Merge pull request #49467 from rallytime/bp-49451 
Back-port #49451 to 2018.3.3
 2018-08-31 13:38:08 -04:00
Nicole Thomas
37d1455d69
Merge pull request #49468 from rallytime/bp-49291-and-49331 
Back-port #49291 and #49331 to 2018.3.3
 2018-08-31 13:37:29 -04:00
Daniel A Wozniak
944f8e96c8
Use salt.utils to ensure string type 2018-08-31 10:21:14 -04:00
Daniel A. Wozniak
6c92ed2021
Fix review nits 2018-08-31 10:19:16 -04:00
Daniel A. Wozniak
0e18b157e3
Re-factor dedent to fix warts 
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
 2018-08-31 10:19:11 -04:00
Daniel A. Wozniak
b5034067f8
Use salt.utils.to_* functions 2018-08-31 10:19:04 -04:00
Daniel A. Wozniak
6399d035a4
Add dedent that sets line endings 2018-08-31 10:18:55 -04:00
Daniel Wallace
b891a0a8d3
add lock for proxy minion process too 2018-08-31 10:06:56 -04:00
Daniel Wallace
72519878c0
start thread in try block 2018-08-31 10:06:56 -04:00
Daniel Wallace
b878f01662
use finally instead of catching baseexception 2018-08-31 10:06:55 -04:00
Daniel Wallace
de98be6093
use rlock so blocking can be passed in py2 2018-08-31 10:06:55 -04:00
Daniel Wallace
d346b42332
import Callable from collections.abc for python3.7 
https://bugs.python.org/issue25988
 2018-08-31 10:06:55 -04:00
Daniel Wallace
d7a410070a
Handle thread shutdown on system exit 
Handle changes made for https://bugs.python.org/issue18966 in python 3.7
 2018-08-31 10:06:55 -04:00
Nicole Thomas
0cda22e7a9
Merge pull request #49449 from rallytime/flaky-test 
Mark status test as flaky
 2018-08-30 14:10:43 -04:00
Nicole Thomas
bcc5f1a7c1
Merge pull request #49444 from rallytime/bp-49299 
Back-port #49299 to 2018.3.3
 2018-08-30 14:10:20 -04:00
Nicole Thomas
38713e2db9
Merge pull request #49448 from rallytime/bp-49400 
Back-port #49400 to 2018.3.3
 2018-08-30 14:04:28 -04:00
Nicole Thomas
d6ddcab351
Merge pull request #49446 from rallytime/bp-49356 
Back-port #49356 to 2018.3.3
 2018-08-30 14:04:00 -04:00
Nicole Thomas
1a67956c0f
Merge pull request #49445 from rallytime/bp-49192 
Back-port #49192 to 2018.3.3
 2018-08-30 14:03:44 -04:00
Nicole Thomas
33f59d44de
Merge pull request #49443 from rallytime/bp-49197 
Back-port #49197 to 2018.3.3
 2018-08-30 14:03:09 -04:00
Nicole Thomas
60758059c3
Merge pull request #49442 from rallytime/bp-49180 
Back-port #49180 and related fixes to 2018.3.3
 2018-08-30 14:02:53 -04:00
Nicole Thomas
1f4906346a
Merge pull request #49441 from rallytime/bp-49240 
Back-port #49240 to 2018.3.3
 2018-08-30 14:02:39 -04:00
Nicole Thomas
cc27b67a37
Merge pull request #49440 from rallytime/bp-49258 
Back-port #49258 to 2018.3.3
 2018-08-30 14:02:25 -04:00
rallytime
0f322bb39f
Mark status test as flaky 2018-08-30 11:34:05 -04:00
rallytime
b953fe0079
Mark pillar refresh test as flaky 2018-08-30 11:24:33 -04:00
Daniel A. Wozniak
8022b0c3d6
Fix tests that use timed_subprocess for py3 2018-08-30 10:52:14 -04:00
Daniel A. Wozniak
20148d4438
Test fixes 
- Fix tearDown method to remove unicode environment key.
- Mark flaky test as such, test_set_system_time fails when run at
  certian times of the day.
 2018-08-30 10:50:41 -04:00
Daniel A. Wozniak
b8c5a5bb91
Fix string formatting wart in file state tests 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
19756022be
Fix wart in file state test 2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
ba68388342
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-30 10:48:02 -04:00
Daniel A. Wozniak
5fe821978e
File state line ending fixes 2018-08-30 10:44:14 -04:00
Daniel A. Wozniak
e155568957
Fix typo 2018-08-30 10:40:10 -04:00
Daniel A. Wozniak
608a1ae7ba
Account for file renames 2018-08-30 10:39:42 -04:00
Daniel A. Wozniak
e8e6a46a2b
Fix directory unit test 2018-08-30 10:39:37 -04:00
Daniel A. Wozniak
2f865c398e
Fix is_windows checks 2018-08-30 10:39:32 -04:00
Daniel A. Wozniak
6460f7f217
Account for normalized dirs in unit tests 2018-08-30 10:39:28 -04:00
Daniel A. Wozniak
f4b7101a35
Simplify dict keys lookup 2018-08-30 10:39:15 -04:00