Daniel A. Wozniak
95efc516ba
Fix typo
2018-08-17 21:39:22 -07:00
Daniel Wozniak
6d57ac1083
Merge pull request #49180 from dwoz/test_fixes
...
Cherry-pick test fixes
2018-08-17 21:08:16 -07:00
Daniel Wozniak
b510441803
Merge pull request #49179 from dwoz/test_unit_states_file
...
Account for normalized dirs in unit tests
2018-08-17 21:07:48 -07:00
Samuel D. Leslie
2fe675cfdd
Update documentation to correctly state enable_gpu_grains default
...
While the relevant code in grains/core.py does enable GPU grains by
default, the default in config/__init__.py for the DEFAULT_MASTER_OPTS
dictionary is disabled. This takes precedence over the default in
grains/core.py which would only take effect if the enable_gpu_grains
setting was not specified at all.
2018-08-18 13:47:53 +10:00
Samuel D. Leslie
2e29b292bf
Remove obsolete documentation on external_nodes setting
...
This setting is no longer used anywhere in the codebase having been
superseded by the master_tops setting many releases ago.
2018-08-18 13:11:02 +10:00
Daniel A. Wozniak
3c49544c19
Account for file renames
2018-08-17 15:06:41 -07:00
Daniel A. Wozniak
acc144d6a9
Fix directory unit test
2018-08-17 14:08:58 -07:00
Daniel A. Wozniak
913ea5ebde
Fix directory unit test
2018-08-17 14:07:19 -07:00
Daniel A. Wozniak
a7ee07ab81
Fix is_windows checks
2018-08-17 13:48:31 -07:00
Daniel A. Wozniak
74b197f643
Account for normalized dirs in unit tests
2018-08-17 13:36:41 -07:00
Daniel Wallace
a18d937156
Merge pull request #49167 from dwoz/filefix
...
Fix remaining file state integration tests (py3)
2018-08-17 13:36:03 -07:00
Daniel A. Wozniak
3363238ff6
Account for normalized dirs in unit tests
2018-08-17 13:17:08 -07:00
Daniel Wozniak
7486fd5447
Merge pull request #49162 from erwindon/wheel_error_error
...
Fixed unknown 'exceptions' under Python3 (#49152 )
2018-08-17 10:37:17 -07:00
Mike Place
22240c073b
Merge branch '2018.3' into tls-impr
2018-08-17 16:57:09 +02:00
Mike Place
7043286d6c
Merge pull request #49143 from Ch3LL/bp-49142
...
[2017.7] Backport #49142
2018-08-17 16:40:39 +02:00
Mike Place
ca5df0498e
Merge branch '2017.7' into wheel_error_error
2018-08-17 16:22:33 +02:00
Mike Place
c2aba7abde
Merge branch '2017.7' into issue49154
2018-08-17 16:14:08 +02:00
Daniel Wallace
8ab55f5552
Merge pull request #49167 from dwoz/filefix
...
Fix remaining file state integration tests (py3)
2018-08-17 08:31:40 -05: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
Erwin Dondorp
4335c5cdc4
Must have 2 lines between imports and code
2018-08-17 12:29:22 +02:00
Erwin Dondorp
ec1f013573
Improved solution as per @dwoz's suggestion
2018-08-17 11:14:40 +02:00
Daniel A. Wozniak
b5ba073d65
Simplify dict keys lookup
2018-08-16 23:33:52 -07:00
Daniel A. Wozniak
6844251315
Fix remaining file state integration tests (py3)
2018-08-16 19:57:39 -07:00
twangboy
7264008fed
Fix some lint (remove whitespace)`
2018-08-16 15:04:07 -06:00
twangboy
4f9973db20
Improve timeout in delete
...
Improved error handling
2018-08-16 15:01:18 -06:00
twangboy
a6ecb7552d
Remove testing debug stuff
2018-08-16 14:03:16 -06:00
twangboy
7dd795322e
Fix start/stop functions
...
Fix typo in the dict key 'Status'
Standardize docs
Fix some lint issues
Rename the new helper function to _status_wait
Add urls to code comments
Add version added statements
2018-08-16 14:00:38 -06:00
Erik Johnson
b4544d7f89
Add keep_source integration tests
2018-08-16 14:53:32 -05:00
Daniel Wozniak
90bd56063e
Merge pull request #49163 from dwoz/tmp_dir
...
Allow test suite to finish if tmp dir removal fails
2018-08-16 12:32:15 -07:00
Erik Johnson
82638c6dd2
Fix bug in keep_source for non-templated salt:// file sources
...
Unless the file is one of A) a remote file source (http/https/ftp/etc.)
or B) being templated, then `file.get_managed` does not cache the file.
Thus, the variable we rely on to tell us the cached path is an empty
string, and we don't remove it even though the file would eventually
later be cached when we run `file.manage_file`. This adds some
additional logic to ensure that we do check if the file has been cached
if `sfn` is an empty string.
2018-08-16 14:01:15 -05:00
Daniel A. Wozniak
3384864e8f
add Exception type
2018-08-16 11:57:28 -07:00
Daniel A. Wozniak
9da79dd0b5
Allow test suite to finish if tmp dir removal fails
2018-08-16 10:48:19 -07:00
Erwin Dondorp
20f134edea
Fixed unknown 'exceptions' under Python3 ( #49152 )
2018-08-16 19:18:18 +02:00
Shane Lee
fade0a6acd
Merge pull request #10 from damon-atkins/patch-1
...
2017_win_service
2018-08-16 10:25:14 -06:00
Damon Atkins
57c4b9ff55
2017_win_service_damon
...
Merge this if you like the suggestion.
2018-08-16 14:58:35 +10:00
twangboy
d44eaeed6c
Add timeout support to the state
...
Remove redundent net stop command from the stop function
Remove extra _enable call on Windows that was causing incorrect state
return comments
2018-08-15 19:20:46 -06:00
twangboy
d579b3e2ef
Add timeout parameter
...
Add a timeout parameter to start, stop, restart, and delete
2018-08-15 16:18:10 -06:00
Ch3LL
d2e73cc988
Remove -Z script_arg for cloud tests
2018-08-15 17:35:23 -04:00
Daniel Wallace
aa01a674c4
Merge pull request #49136 from Ch3LL/bootstrap_2017.7
...
[2017.7] Update bootstrap script to latest release (2018.08.15)
2018-08-15 14:49:15 -05:00
Ch3LL
de40dfb142
[2017.7] Update bootstrap script to latest release (2018.08.15)
2018-08-15 15:30:20 -04:00
Ch3LL
3a8fed5e57
Handle race condition when running mine.update in orch mine test
2018-08-15 13:16:26 -04:00
Ch3LL
b4e421c3d6
Add orch runner with mine.get integration tests
2018-08-15 13:16:26 -04:00
Mike Place
c8510a6b96
Merge pull request #49062 from weswhet/fix-mac-available-services
...
fix memoize on available macOS services
2018-08-15 17:34:24 +02:00
Ronald van Zantvoort
3ce2c3e2e4
tls.cert_info: strip newlines/spaces from extensions
2018-08-15 12:49:45 +02:00
Ronald van Zantvoort
d522d01786
tls alt_names fix
2018-08-15 12:21:51 +02:00
Mike Place
21435be45f
Merge pull request #49125 from terminalmage/issue49100
...
Ensure that we don't feed jinja2.Markup() a str type
2018-08-15 06:02:29 +02:00
Ronald van Zantvoort
d435dbc85e
Fix bytes-return of tls.cert_info extensions
2018-08-15 01:10:51 +02:00
Ronald van Zantvoort
9c7d3eae72
TLS cert_info: Accept IP Addresses as valid alt_names
2018-08-15 01:05:12 +02:00
Ronald van Zantvoort
7d6ecafa94
tls.check_info: Allow PEM as string input
2018-08-15 00:57:24 +02:00
Erik Johnson
ec258e235d
Add integration tests for yaml and json filters
2018-08-14 17:02:17 -05:00
