Nicole Thomas
f0cd8478d2
Merge pull request #50021 from twangboy/add_grains
...
Add a `windowsdomaintype` grain
2018-10-25 09:45:38 -04:00
Nicole Thomas
9ad43f2b71
Merge pull request #50063 from twangboy/fix_50039
...
Use long when setting REG_QWORD
2018-10-25 09:45:02 -04:00
Nicole Thomas
01b083e20b
Merge pull request #50188 from garethgreenaway/49965_beacon_diskusage_windows
...
[2018.3] fixes to diskusage beacon
2018-10-25 09:41:18 -04:00
Nicole Thomas
9ea51c00bd
Merge pull request #50214 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-10-25 09:38:39 -04:00
Nicole Thomas
51b3fa4bb6
Merge pull request #50216 from garethgreenaway/50162_when_plus_splay_endless_loop
...
[2018.3] Fixes to scheduler, list of whens plus splay
2018-10-25 09:31:25 -04:00
Gareth J. Greenaway
685509fae3
Fixing an issue when a combination of the when parameter as a list plus using the splay parameter would cause the schedule to continuously run jobs in an endless loop, regardless of if their scheduled time had been receached. Also fixing a related issue where scheduled jobs that rely on _next_fire_time were not being run as the corrected splayed time but rather running at the original scheduled time. Adding new tests.
2018-10-24 17:22:37 -07:00
Daniel Wozniak
43303fb6cd
Merge pull request #50190 from dwoz/grains_template_test
...
Fix test_managed_file_with_grains_data on Windows
2018-10-24 15:43:35 -07:00
rallytime
897145c4a1
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-10-24 15:54:15 -04:00
Nicole Thomas
462314b286
Merge pull request #50187 from garethgreenaway/port_49871_to_2018_3
...
[2018.3] Adding fixes to scheduler tests to 2018.3
2018-10-24 15:45:31 -04:00
Nicole Thomas
8ad9a1bd61
Merge pull request #50201 from Ch3LL/_2018.3.3
...
[2018.3] Ensure that tokens are hex to avoid hanging/errors in cherrypy
2018-10-24 15:44:23 -04:00
Nicole Thomas
017d39400a
Merge pull request #50202 from Ch3LL/_2017.7.8
...
[2017.7] Ensure that tokens are hex to avoid hanging/errors in cherrypy
2018-10-24 15:42:11 -04:00
Nicole Thomas
f28a4fa1a6
Merge pull request #50211 from channias/fix-spm-modules-install
...
Fix broken install of additionnal modules in SPM packages
2018-10-24 15:41:22 -04:00
Nicole Thomas
6b4e07be03
Merge pull request #50212 from dwoz/test_no_fail
...
Do not fail if process already ended
2018-10-24 15:22:46 -04:00
twangboy
5fdba7d0ee
Disable lint error
2018-10-24 11:49:01 -06:00
twangboy
84b8dd6856
Add tests
2018-10-24 11:49:01 -06:00
twangboy
4644bb63f2
Use long when setting REG_QWORD
2018-10-24 11:49:01 -06:00
twangboy
be6a6ac1a5
Skip test that is missing win32 libraries
2018-10-24 11:43:10 -06:00
Daniel A. Wozniak
7f613ac020
Do not fail if process already ended
...
We can expect the subprocess has already ended by the time we're
checking for child processes. Handle this case gracefully so that tests
do not fail with an exception.
2018-10-24 10:17:59 -07:00
Nicolas Chancereul
9b203d544d
Fix broken install of additionnal modules in SPM packages
...
Fixes #44554
2018-10-24 18:44:46 +02:00
Gareth J. Greenaway
1f0ab278f0
Merge branch '2018.3' into 49965_beacon_diskusage_windows
2018-10-24 09:42:36 -07:00
Gareth J. Greenaway
25e7cb61b4
Merge branch '2018.3' into port_49871_to_2018_3
2018-10-24 09:37:45 -07:00
Gareth J. Greenaway
d232dfb9b7
Update test_eval.py
2018-10-24 09:37:23 -07:00
Nicole Thomas
88673ad9e7
Merge pull request #50208 from Ch3LL/2update_version_doc_2018.3
...
Update release versions for the 2018.3 branch
2018-10-24 11:52:18 -04:00
Nicole Thomas
85e22d2f25
Merge pull request #50207 from Ch3LL/2update_version_doc_2017.7
...
Update release versions for the 2017.7 branch
2018-10-24 11:51:12 -04:00
Nicole Thomas
db8ef1efa7
Merge pull request #50206 from Ch3LL/rn_2018.3.3
...
[2018.3.3] remove in progress and add security details
2018-10-24 11:50:49 -04:00
Daniel Wallace
3d3db70454
Merge pull request #50200 from rallytime/bp-50181
...
Back-port #50181 to 2018.3
2018-10-24 10:49:57 -05:00
Nicole Thomas
d0356955e5
Merge pull request #50205 from Ch3LL/rn_2017.7.8
...
[2017.7.8] remove in progress and add security details
2018-10-24 11:49:51 -04:00
C. R. Oldham
f3e5399cc4
Ignore testinfra 1.17.0
2018-10-24 11:38:24 -04:00
Ch3LL
896caa120f
Add 2016.11.10 release notes to 2018.3 branch
2018-10-24 11:08:38 -04:00
Ch3LL
cdbf493400
Add 2017.7.8 previous release
2018-10-24 10:39:04 -04:00
Ch3LL
198d25ca1d
Add 2017.7.8 previous release
2018-10-24 10:38:37 -04:00
Ch3LL
6f775e748a
Update release versions for the 2018.3 branch
2018-10-24 10:34:26 -04:00
Ch3LL
d4e26aceda
Update release versions for the 2017.7 branch
2018-10-24 10:34:24 -04:00
Ch3LL
1e3415860f
[2018.3.3] remove in progress and add security details
2018-10-24 10:31:16 -04:00
Ch3LL
71ee68b6f1
[2017.7.8] remove in progress and add security details
2018-10-24 10:27:39 -04:00
Daniel A. Wozniak
b77db48d77
Fix test_managed_file_with_grains_data on Windows
2018-10-23 22:58:09 -07:00
Gareth J. Greenaway
42b3203cf9
Fixing lint
2018-10-23 19:14:00 -07:00
Gareth J. Greenaway
d8d8559b75
Fixing lint
2018-10-23 19:09:02 -07:00
Gareth J. Greenaway
f65fa57a10
Fixing a bug in the diskusage beacon that prevented it from working on Windows. Adding a couple tests to test functionality on Windows.
2018-10-23 19:03:19 -07:00
Gareth J. Greenaway
76e62322fa
Removing unnecessary debugging lines
2018-10-23 16:03:07 -07:00
Gareth J. Greenaway
d2d0622a6d
Back porting #49871 to 2018.3. Adding some additional changes to ensure they are passing on OS X.
2018-10-23 15:58:59 -07:00
twangboy
7e8d21456e
Add tests
2018-10-23 16:17:38 -06:00
twangboy
501ade2ed1
Add additional grains and system info
...
Adds the `windowsdomaintype` grain
Adds the get_join_info util to populate said grain
Adds additional information to the output of `get_system_info` since
we're already pulling the data anyway with the WMI call
2018-10-23 16:17:28 -06:00
Erik Johnson
85612cfc8f
runtests.py: Fix IndexError in --from-filenames
2018-10-23 14:53:20 -05:00
Daniel A. Wozniak
25097f9933
Make sure from-filenames intersect with names-file
...
When both names-file an from-names are defined we want to make sure the
tests that from-filenames returns intersect with the test in the names
file.
2018-10-23 14:53:01 -05:00
Erik Johnson
ed864ceb28
runtests.py: Accept modified file list from a text file
2018-10-23 14:52:39 -05:00
rallytime
059754c207
Add some doc tests to the filemap that should run on every PR
...
These files test aspects of the documentation that are not covered by the
pylint or doc build runs. Therefore, these should run on all incoming PRs.
2018-10-23 14:52:19 -05:00
Erik Johnson
b1ee2e524b
Set a default value for the filename map path
2018-10-23 14:51:39 -05:00
Erik Johnson
5ea1024b5d
Add documentation explaining naming convention for test files
2018-10-23 14:51:28 -05:00
Erik Johnson
8f790c0e74
Fix conflicting dict key in filename map
2018-10-23 14:48:32 -05:00
