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
95,931 Commits 24 Branches 182 Tags 341 MiB
aba114ea13
Commit Graph

14240 Commits

Author SHA1 Message Date
Anthony Shaw
20bf3067b9
reproduce bug in 47425 2018-10-30 14:38:22 -04:00
Nicole Thomas
1aae681229
Merge branch '2018.3' into bp-50230 2018-10-30 12:26:15 -04:00
rallytime
381a59d56e
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/states/pip_state.py
  - tests/integration/cloud/clouds/test_ec2.py
 2018-10-30 11:41:18 -04:00
rallytime
f23852207f
Fix matcher grain file 
This was inadvertently changed in th filename_map backport.

This commit restores the matcher grain file to match all branches previous
to the inadvertent change.
 2018-10-30 09:51:51 -04:00
Brett Benassi
80982ada82
Removing an un needed change and maybe fixing the lint error 2018-10-29 15:30:51 -06:00
rallytime
1ef712a178
Add various ssh tests to the filemap for salt/utils/vt.py changes 
Some of the salt-ssh tests use the salt/utils/vt.py functions. A recent
change in that file caused about 90 tests to start failing on the branch.

We need to make sure these tests run when changes to the vt.py util are
made in PRs.
 2018-10-29 16:40:23 -04:00
Daniel Wallace
fb43061cb1
fix test 2018-10-29 14:45:23 -05:00
Daniel Wallace
5eb0e37f4e
add extra space to localemod test 2018-10-29 14:31:36 -05:00
Nicole Thomas
10ba8b42a8
Merge pull request #50276 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-10-29 15:05:14 -04:00
Nicole Thomas
0f1dc08d41
Merge pull request #50282 from twangboy/fix_test_diskusage 
Fix `unit.beacons.test_diskusage` on Windows
 2018-10-29 14:37:12 -04:00
twangboy
fd369dd115
Mock is_windows = False 2018-10-29 10:25:56 -06:00
Nicole Thomas
f7c2f04574
Merge pull request #50182 from terminalmage/issue50050 
Backport runtests.py modifications from develop to 2018.3
 2018-10-29 12:25:06 -04:00
rallytime
f05abb09de
Merge branch '2017.7' into '2018.3' 2018-10-29 11:22:36 -04:00
Nicole Thomas
4fdcf7c4a7
Lint: Add extra blank line 2018-10-29 11:17:12 -04:00
Brett Benassi
cebfd8ad03
Fixing lint error 2018-10-29 09:08:48 -06:00
rallytime
113d76e045
Revert "Move jinja templating tests alongside salt/utils/jinja.py's tests" 
This reverts commit 6d9c2eb6b0.
 2018-10-29 11:05:33 -04:00
Brett Benassi
2df611565a
Adding subnetID so it knows the right VPC to build the node in. 2018-10-29 08:57:22 -06:00
rallytime
8968f9d164
Revert "Rename test_map_conf test file to respect naming convention" 
This reverts commit 8326a09921.
 2018-10-29 10:46:29 -04:00
rallytime
85a9395c2a
Remove saltclass pillar unit test for list expansion 
This test only applies to functionality present in Fluorine or newer.

This commit will need to be reverted again in the fluorine branch.
 2018-10-29 10:34:24 -04:00
rallytime
3d95673be0
Use get_config_dir() instead of self.config_dir 
This attribute does not exist in the 2018.3 branch. Use the function
for now, and then change this back on the merge-forward.
 2018-10-29 10:23:00 -04:00
rallytime
e8b3a62b31
Add init file back in for unit/client pkg 
This file was accidentally removed during some test renaming. The absence
of this file prevents the test from running due to an ImportError.
 2018-10-29 10:19:52 -04:00
rallytime
a0cfbdcb79
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-29 09:55:06 -04:00
Brett Benassi
6a1e9f0a7f
Adding securitygroupname as the config instead of securitygroup 2018-10-26 15:38:48 -06:00
Cédric Bosdonnat
d527dd29cc
Rename states/test_libvirt.py into states/test_virt.py 
Modules test files are named after the module itself, the state virt
module needs to comply with that rule too.
 2018-10-26 16:05:03 -04:00
rallytime
ab4a670ff2
Remove pgjsonb returner unit tests 
The tests that are written in this file are for functions not present
in the 2018.3 branch.

This commit will need to be reverted in the merge-forward to `fluorine`.
 2018-10-26 15:58:46 -04:00
rallytime
68ab3eef55
Remove "test_custom" from grains section of filename_map 
This test is for functionality only available in fluorine and newer.

Removing this for 2018.3.
 2018-10-26 15:17:12 -04:00
rallytime
68146983cb
Remove test_error from scheduler tests 
These tests are not present on 2018.3
 2018-10-26 14:54:25 -04:00
rallytime
c55dcf02eb
Add init file back in for integration/cloud/clouds pkg 
This was accdientally removed during some cloud test file renaming, which
prevents the test from running due to an ImportError
 2018-10-26 14:32:03 -04:00
rallytime
dfa05b978e
Remove test files for beacons that don't exist in 2018.3 2018-10-25 11:16:11 -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
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
twangboy
84b8dd6856
Add tests 2018-10-24 11:49:01 -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
Gareth J. Greenaway
d232dfb9b7
Update test_eval.py 2018-10-24 09:37:23 -07: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
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
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
8f790c0e74
Fix conflicting dict key in filename map 2018-10-23 14:48:32 -05:00
Erik Johnson
f2e55128bb
Evan Moar Lint 2018-10-23 14:48:32 -05:00
Erik Johnson
65fef9a7c0
Moar Lint 2018-10-23 14:48:31 -05:00
Erik Johnson
39c245525f
Lint 2018-10-23 14:48:31 -05:00
Erik Johnson
dd20f12988
Make sure we always run the module names test 2018-10-23 14:47:17 -05:00
Erik Johnson
2ac939eace
Add test to check test module names and make sure they match the naming convention 2018-10-23 14:47:17 -05:00
Erik Johnson
785d2989b9
Add integration.netapi.rest_tornado.test_app to filename map 2018-10-23 14:47:17 -05:00
Erik Johnson
662ca0de73
Rename files to match naming convention 2018-10-23 14:47:17 -05:00
Erik Johnson
186d333c92
Add back changes lost in cherry-pick 2018-10-23 14:46:05 -05:00
Erik Johnson
a2365317f2
Add back test accidentally deleted when cherry-picking 2018-10-23 14:46:05 -05:00
Erik Johnson
eaa4da3d49
Rename providers to clouds to respect naming convention 
Also, move rackspace openstack-based tests to test_openstack.py
 2018-10-23 14:46:05 -05:00
Erik Johnson
85b96de009
Rename some files to avoid them being identified as test modules 2018-10-23 14:41:06 -05:00
Erik Johnson
bfb6015428
Rename/consolidate salt.utils unit tests to conform to naming convention 2018-10-23 14:39:17 -05:00
Erik Johnson
84749dd854
Consolitdate and move salt-ssh unit tests to proper location 2018-10-23 14:33:43 -05:00
Erik Johnson
71825a596e
Consolidate and move loader tests to test/unit/test_loader.py 2018-10-23 14:31:08 -05:00
Erik Johnson
8326a09921
Rename test_map_conf test file to respect naming convention 2018-10-23 14:29:02 -05:00
Erik Johnson
6d9c2eb6b0
Move jinja templating tests alongside salt/utils/jinja.py's tests 2018-10-23 14:28:45 -05:00
Erik Johnson
1ef43a34bd
Add additional paths to the filename map 2018-10-23 14:22:07 -05:00
Erik Johnson
75e6731027
Use the new helper to get the test mods 2018-10-23 14:22:07 -05:00
Erik Johnson
c3dc8ec1d0
Add function to get all of the test modules 2018-10-23 14:22:07 -05:00
Erik Johnson
c5593bc843
Rename custom_grains.py so it's not identified as a test module 2018-10-23 14:22:07 -05:00
Erik Johnson
330c21179a
Consolidate saltclass pillar unit tests into single module 2018-10-23 14:21:48 -05:00
Erik Johnson
a642619fa9
Rename test pgjsonb returner test file to match naming convention 2018-10-23 14:21:48 -05:00
Erik Johnson
6433c48d8c
Don't import old module name 
We'll handle the old name when backporting
 2018-10-23 14:21:21 -05:00
Erik Johnson
a97e0320bf
Move helper outside of for loop 2018-10-23 14:21:21 -05:00
Erik Johnson
3f1b6fd661
Add more unit test mapping 2018-10-23 14:21:21 -05:00
Erik Johnson
ac3406d031
Fill out the filename map a bit 2018-10-23 14:21:21 -05:00
Erik Johnson
07d6f2aca0
Enhancements to --from-filenames, --filename-map options 
This commit adds the following features:

- Changes to test modules are identified, and those tests are added to
  the list of tests to be run
- expr_match is used to allow the filename map to use either globbing or
  regular expressions
- Corresponding state tests are added when doing filename matches,
  meaning that for example the git state tests will be run when the git
  execution module is in the --from-filenames list
 2018-10-23 14:21:21 -05:00
Erik Johnson
b851a41ef8
Don't run unit or integration tests unnecessarily 
If --from-filenames (and optionally --filename-map) yield no matches,
this will keep from running the entire unit/integration suite.
 2018-10-23 14:21:21 -05:00
Erik Johnson
569276bedf
Add an initial filename_map 2018-10-23 14:21:21 -05:00
Erik Johnson
44199b1d33
Add --from-filenames and --filename-map options to parser 
This allows for the passed filename(s) to decide which tests are run
 2018-10-23 14:21:21 -05:00
m03
f5d6080237
Add test_to_none 2018-10-23 10:30:31 -04:00
Gareth J. Greenaway
8fa87e3dc9
Update test_network.py 2018-10-21 08:39:29 -07:00
Gareth J. Greenaway
311796994b
Fixing scenario where the interface for the default route has a dash in it, regular expression used in get_route currently doesn't not account for this.. Adding some additional tests for network.get_route. 2018-10-20 15:57:25 -07:00
Daniel Wozniak
0ece06ef66
Merge pull request #50085 from dwoz/win_pkg_redux 
Fix `test_win_pkg` yet again
 2018-10-19 11:16:15 -07:00
Mike Place
de23c83f54
Merge pull request #50114 from rallytime/bp-50061 
Back-port #50061 to 2018.3
 2018-10-19 05:46:02 -06:00
Mike Place
9188bec831
Merge pull request #50115 from garethgreenaway/apply_49104_to_2018_3 
[2018.3] Apply scheduler fixes and tests from #49104 to 2018.3
 2018-10-19 05:45:30 -06:00
Erik Johnson
91812ff510
Squelch spurious errors logged in unit tests 
We are getting errors in the LazyLoader because certain functions are
not present in the LazyDict due to being left out of the whitelist.
These don't cause the tests to fail, but they do result in a lot of
spurious errors in the test suite.
 2018-10-18 14:01:28 -05:00
Gareth J. Greenaway
adb1e79723
Apply scheduler fixes and tests from #49104 to 2018.3 2018-10-18 08:27:59 -07:00
Erik Johnson
1f09104b0d
Add unit test for pkg.install with epoch 2018-10-18 11:16:58 -04:00
Mike Place
f22630eacb
Merge branch '2018.3' into win_pkg_redux 2018-10-18 13:06:31 +02:00
rallytime
8609064f30
Update old utils paths to use new paths 2018-10-17 10:24:26 -04:00
rallytime
a984ad8b3d
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-17 10:21:42 -04:00
Nicole Thomas
7ec3840d25
Merge pull request #49794 from twangboy/fix_groupadd_test 
Fix possible issue with test_groupadd
 2018-10-17 10:20:33 -04:00
Daniel A. Wozniak
9f5722a71d
The test is not a flush problem 2018-10-16 22:22:49 -07:00
Daniel A. Wozniak
128c2c5423
Flush and sync file contents 2018-10-16 12:40:23 -07:00
Mike Place
f3fe4b67f7
Merge pull request #50064 from rallytime/bp-50022 
Back-port #50022 to 2018.3
 2018-10-16 11:09:46 +02:00
Daniel Wallace
4c4bb5a489
Merge pull request #49987 from terminalmage/pillar_roots 
Make Pillar no longer munge file_roots
 2018-10-15 16:58:08 -05:00
Brian Saville
40da3ce2d0
Make test check_pillar more lenient 2018-10-15 16:50:57 -04:00
Erik Johnson
f59506d4cc
Update tests to reflect behavior changes 2018-10-15 10:16:44 -05:00
Daniel Wozniak
fef7669a15
Merge pull request #49809 from Ch3LL/win_pkg_flaky 
Add additional asserts to help investigate test_win_pkg failure
 2018-10-13 11:00:08 -07:00
Daniel A. Wozniak
beaab2a05a
Fix win_pkg test 
Bugfix in file_list cache. The file_list cache age could be a negative
number meaning the file_list cache can get used in tests even though the
cache timeout is set to 0 for test suite runs.
 2018-10-11 15:47:44 -07:00
Erik Johnson
58f5fde03c
Make Pillar no longer munge file_roots 
Pillar and the local fileclient used to use the same class, but this
changed a few years ago with the introduction of FSClient (which enabled
non-roots fileserver backends in masterless Salt). Since Pillar is the
only thing that uses this client, there is no longer a reason to make
Pillar modify file_roots.
 2018-10-10 13:10:50 -05:00
Nicole Thomas
c912d3a288
Merge pull request #49946 from isbm/isbm-osversion_info-fixes 
osversion/osversion_info/osmajorrelease grains fixes
 2018-10-10 10:01:03 -04:00
Nicole Thomas
18fb5df639
Merge pull request #49918 from garethgreenaway/48204_mysql_user_password_exception_part_deux 
[2018.3] Fixes to MySQL module
 2018-10-10 10:00:10 -04:00
Nicole Thomas
e427306da7
Merge pull request #49907 from brejoc/2018.3-fix-for-list-compound-targeting 
2018.3 fix for list compound targeting
 2018-10-10 09:33:39 -04:00
Mike Place
92c06800e0
Merge branch '2018.3' into 48204_mysql_user_password_exception_part_deux 2018-10-09 10:01:45 -06:00
Bo Maryniuk
a17ba35a5b Fix proper part name in the string-bound CPE 2018-10-09 16:37:15 +02:00
Bo Maryniuk
9d4960752e Expand unit test to verify part name 2018-10-09 16:36:53 +02:00
rallytime
df11c396ec
Skip pillar refresh test 
This test is flaky and fails intermittently, even with the `flaky` decoractor.

Skipping for now until we can debug further.
 2018-10-09 10:26:45 -04:00
Bo Maryniuk
712083df0e Add unit test for broken CPE_NAME 2018-10-09 14:11:56 +02:00
Bo Maryniuk
1306ddb111 Add unit test for v2.3 of CPE format 2018-10-09 14:11:42 +02:00
Bo Maryniuk
04b61d3795 Add unit test for WFN format of CPE_NAME 2018-10-09 14:11:23 +02:00
Nicole Thomas
1bcadb934b
Merge branch '2018.3' into 2018.3-fix-for-list-compound-targeting 2018-10-08 10:19:35 -04:00
Daniel A. Wozniak
e5ea3f1956
Try running fsync to avoid fs caching race condition 2018-10-06 12:49:49 -07:00
Gareth J. Greenaway
dd96c130fb
Fixing lint. 2018-10-05 22:27:52 -07:00
Gareth J. Greenaway
ac7da89432
Tweaking a couple tests to account for new scenarios with later versions. 2018-10-05 19:04:51 -07:00
Gareth J. Greenaway
9265195deb
Updating the mysql update to handle changes in version 8.0.11 where PASSWORD was removed. Updating unit tests. 2018-10-05 18:06:48 -07:00
Daniel A. Wozniak
9997f45626
Merge branch '2018.3' into shelltests 2018-10-05 11:15:23 -07:00
Daniel Wozniak
eee82d3a87
Merge pull request #49875 from dwoz/win_spm_tests 
Add spm tests to Windows suite
 2018-10-05 11:13:06 -07:00
Nicole Thomas
c0e240461a
Merge pull request #49872 from twangboy/fix_49861 
Fix issues with windows file permissions when using reset=True
 2018-10-05 09:52:06 -04:00
Jochen Breuer
7d0b20c91e
Minor fix for def test_batch_run_grains_targeting 
item was never "minion" without a colon, but os_grain was overwritten
anyway. So this fix does not actually affect the test outcome.
 2018-10-05 09:02:15 +02:00
Daniel A. Wozniak
df5e27156e
Add spm tests for windows 2018-10-04 15:43:50 -07:00
Daniel A. Wozniak
1005b91690
Debug win_pkg 2018-10-04 15:34:10 -07:00
Ch3LL
9dce5cc7ba
Fix the assertion message order 2018-10-04 12:10:45 -04:00
Ch3LL
18e9a2831a
Add additional asserts to help investigate test_win_pkg failure 2018-10-04 12:03:06 -04:00
twangboy
01bd847bcd
Gate the win_function a little better 2018-10-04 10:02:59 -06:00
Daniel A. Wozniak
8bfa634f3c
Fix warts in integration.shell.test_matcher 2018-10-03 18:43:44 -07:00
Daniel A. Wozniak
45d2142c7d
Fix wart in test_cp module 2018-10-03 18:43:43 -07:00
Daniel A. Wozniak
0e4fbc5b50
Add syndic tests to whitelist.txt for Windows 2018-10-03 18:43:43 -07:00
Daniel A. Wozniak
4141cc82e9
Add spm tests to whitelist.txt for Windows 2018-10-03 18:43:43 -07:00
Daniel A. Wozniak
02ad722e02
Add more shell integration tests to whitelist 2018-10-03 18:43:43 -07:00
Daniel Wozniak
48275c0072
Add shell.test_key to whitelist and fix wart 2018-10-03 18:43:43 -07:00
Daniel Wozniak
e5edff4154
Skip tests not valid on windows 2018-10-03 18:43:42 -07:00
Daniel Wozniak
a3897290e8
Add shell cp tests and fix them 2018-10-03 18:43:42 -07:00
twangboy
bcdb3667ae
Skip on non-windows systems 2018-10-03 10:16:28 -06:00
twangboy
8ecbe0eb08
Add tests for check_perms 
Fix some docs
 2018-10-02 18:18:55 -06:00
rallytime
b53c3e695a
Update old utils paths to use new utils paths 2018-10-02 15:12:58 -04:00
rallytime
a65c60d862
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/state.py
  - salt/utils/hashutils.py
  - tests/integration/modules/test_state.py
 2018-10-02 15:09:51 -04:00
Daniel Wozniak
0587fbc5fd
Merge pull request #49828 from dwoz/testslogencoding 
Use utf-8 encoding for salt-runtests.log
 2018-10-01 07:54:22 -07:00
Nicole Thomas
ec978061aa
Merge pull request #49764 from garethgreenaway/49520_multimaster_dns_issue_fix 
[2018.3] Adding retry_dns_count to minion
 2018-10-01 10:20:02 -04:00
Nicole Thomas
aca87abe40
Merge pull request #49782 from dwoz/issue-49043 
Fix issue 49043
 2018-10-01 09:43:01 -04:00
Nicole Thomas
297031b042
Merge pull request #49777 from terminalmage/issue49738 
Fix parallel states with long ID dec or name
 2018-09-30 14:46:02 -04:00
Nicole Thomas
2b323df453
Merge branch '2017.7' into testslogencoding 2018-09-30 14:37:40 -04:00
rallytime
0e761036f1
Merge branch '2018.3.3' into '2018.3' 
No conflicts.
 2018-09-30 12:39:44 -04:00
Nicole Thomas
30ccc5e369
Merge branch '2018.3' into 49520_multimaster_dns_issue_fix 2018-09-30 12:34:55 -04:00
Mike Place
b7d904f4bb
Merge branch '2018.3' into issue-49043 2018-09-30 09:18:54 -05:00
Daniel Wozniak
ed35633a1f Revert diff newline change 2018-09-28 17:06:36 -07:00
twangboy
7a9278b825
Fix broken tests, add new tests 2018-09-28 14:59:27 -06:00
Daniel A. Wozniak
7ce1b645c0
Use utf-8 encoding for salt-runtests.log 2018-09-28 13:08:37 -07:00
Nicole Thomas
fccc08cb31
Merge pull request #49815 from isbm/isbm-ipv6-scope-errors-2018.3 
Bugfix/rework: IPv6 scope errors (bp)
 2018-09-28 15:44:58 -04:00
Erik Johnson
8a9945efd2
Update test docstring to reflect switch to using SHA1 2018-09-28 10:05:18 -05:00
Bo Maryniuk
c14f26f351 Reverse skipping tests: if no ipaddress 2018-09-28 16:31:22 +02:00
Bo Maryniuk
bb37ba0578 Add IPv6 scoped test 2018-09-28 15:49:05 +02:00
Bo Maryniuk
facb34a6cc Add additional check 2018-09-28 15:43:39 +02:00
Bo Maryniuk
615b09aea1 Lintfix: W0611 2018-09-28 15:43:26 +02:00
Nicole Thomas
4d9fc7cee8
Merge pull request #49791 from terminalmage/issue49626 
Fix 3 bugs in subdict matching
 2018-09-28 09:38:33 -04:00
Bo Maryniuk
0498e946f9 Fix ipaddress imports 2018-09-28 15:34:05 +02:00
Erik Johnson
dca90d7bde
Skip parallel states test on Windows until we can get it to work 2018-09-27 12:16:43 -05:00
Gareth J. Greenaway
e66dc18805
Updating the resolve_dns function in minion.py to include a new minion configuration option which will control how many attempts will be made when the master hostname is unable to be resolved before giving up. 2018-09-27 08:44:06 -07:00
Erik Johnson
5a110677b9
Add additional info to the assert to aid in troubleshooting 2018-09-26 14:50:35 -05:00
Erik Johnson
cb19086020
Remove/replace unnecessary setUp/tearDown 
The setUp only needs to run at the beginning so it can be a setUpClass,
and the tearDown logic only applied to a single test and should not be
run after each test.
 2018-09-26 14:50:35 -05:00
Erik Johnson
b3e9678fd9
Fix parallel states with long ID dec or name 
The cache files used for these are based on the state's tag, so longer
ID decs or names will cause errors when the filename's length exceeds
the max allowed by the kernel.

This fixes these errors by taking (up to) the first 32 chars of the
result of base64-encoding the tag, and using that as the parallel cache
filename.
 2018-09-26 14:50:35 -05:00
Daniel Wallace
cf5c179fd9
fix test_managed_file_with_grains_data 
Closes saltstack/salt-jenkins#1121
 2018-09-26 14:49:23 -05:00
twangboy
3d3b67d7d0
Gate for Windows 2018-09-26 13:10:38 -06:00
twangboy
decfa523d1
Check value of result instead of entire dict 2018-09-26 13:06:30 -06:00
Erik Johnson
ac0f8000d8
Fix 3 bugs in subdict matching 
1. Non-ascii was causing a UnicodeDecodeError when matching
2. Matching a dict value after a wildcard (i.e. the key is the wildcard)
   did not work. This is because it was matching the pattern against the
   key, instead of the value as it should have.
3. It was not possible to use a wildcard for the first level of
   matching.
 2018-09-26 13:26:39 -05:00
Daniel A Wozniak
2a901e960d
Fix issue 49043 2018-09-25 23:27:28 -07:00
twangboy
af1ed1c4e3
Add/fix tests 
Use named parameters where possible
 2018-09-25 16:48:16 -06:00
Ch3LL
ad0d83c6a8
Add tests with filname in token data 2018-09-25 16:13:31 -04:00
Ch3LL
9756f8f56e
Add empty token salt-api integration tests 2018-09-25 16:13:31 -04:00
Ch3LL
335227145a
Update tornado test to correct authentication message 2018-09-25 11:47:19 -04:00
Daniel A. Wozniak
a44b37a510
Merge remote-tracking branch 'saltstack/2018.3' into whitelist 2018-09-21 15:39:45 -07:00
Daniel A. Wozniak
90489709ce
Add some debug info to assert 2018-09-21 09:05:12 -07:00
Nicole Thomas
e7bbb83f45
Merge pull request #49720 from cstarke/2018.3 
Seperate prlctl and prlsrvctl checks into each requiring function
 2018-09-21 09:32:46 -04:00
cstarke
4f8476b2ad Fix tests; add test for CommandExecutionError 2018-09-21 11:39:43 +02:00
Nicole Thomas
d434e3664b
Merge pull request #49684 from twangboy/fix_49675 
Detect when system needs reboot after domain join
 2018-09-20 12:17:49 -04:00
Daniel A. Wozniak
536fce611f
Increase function timeout 2018-09-20 09:30:17 -06:00
cstarke
3c96dd2b5e Fix tests for parallels module 2018-09-20 16:46:22 +02:00
Daniel A. Wozniak
ed4de6385d
Fix file serialize test 2018-09-19 22:47:07 -06:00
Daniel A. Wozniak
5ac3738ea9
Merge remote-tracking branch 'saltstack/2018.3' into whitelist 2018-09-19 19:08:50 -06:00
Daniel A. Wozniak
1f60753a47
Do not use close_fds on Windows OS 2018-09-19 19:07:41 -06:00
Daniel A. Wozniak
4a54c7c164
Fix file serialize test 2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
0ec1e1eca3
Increase timeout on flaky test 2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
6ae924b85f
Skip test that is not applicable on windows 2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
598020079f
Increase timeout on flaky test 2018-09-19 11:21:12 -06:00
Daniel A. Wozniak
1757eddae1
Increase ModuleTest.run_function timeout 
Reduce flakyness with greater timeout
 2018-09-19 11:21:12 -06:00
Daniel A Wozniak
7c7353c5f6
Add more tests to whitelist 2018-09-19 11:21:10 -06:00
rallytime
d19c67f619
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-09-19 09:59:32 -04:00
rallytime
7ff24e5fb8
Mark orchestration test as expensive 2018-09-18 20:02:50 -04:00
Gareth J. Greenaway
f4ccc75587
Removing mocking of os.path.join from two tests, one of which was failing when used with coverage argument. No reason we should be mocking os.path.join. 2018-09-18 16:58:48 -06:00
twangboy
3600467a04
Fix some try/except blocks, mark a lazy test 2018-09-18 10:56:51 -06:00
William Giokas
fde757517f
Order the runtests suites 
Uses an ordered dictionary instead of a default python dict when
describing the `TEST_SUITES` variable. Sorts alphabetically based on the
name of the suite.
 2018-09-18 10:04:02 -04:00
Daniel Wozniak
2e1bf1335a
Merge branch '2018.3' into add_whitelist 2018-09-16 10:49:21 -06:00
Daniel A Wozniak
2340a5875f
Fix runner returns test on Windows 2018-09-15 15:14:40 -06:00
Mike Place
9d8cc0b3f4
Merge pull request #49662 from dwoz/2018.3.3 
Fix another bad filename reference in whitelist
 2018-09-14 16:20:48 -06:00
Daniel A. Wozniak
e109023013
Fix another bad filename reference in whitelist 2018-09-14 15:36:30 -06:00
Nicole Thomas
6391560d57
Merge pull request #49655 from dwoz/2018.3.3 
Fix windows test whitelist errors
 2018-09-14 16:34:55 -04:00
Daniel A. Wozniak
8a4946478e
Fix windows test whitelist errors 2018-09-14 10:42:04 -06:00
rallytime
a8a38205e7
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - tests/unit/utils/test_stringutils.py
 2018-09-14 09:33:33 -04:00
rallytime
186f57eede
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/network.py
 2018-09-13 17:11:18 -04:00
Nicole Thomas
3c8ec8a22f
Merge pull request #49644 from rallytime/mark-flaky-test 
Mark grains test as flaky
 2018-09-13 14:25:05 -04:00
Nicole Thomas
3fb3ffdb37
Merge pull request #49641 from rallytime/bp-49632 
Back-port #49632 to 2018.3.3
 2018-09-13 12:46:01 -04:00
rallytime
be8a187b4d Mark grains test as flaky 2018-09-13 16:17:02 +00:00
rallytime
accef8c7dd
Skip some unreliable tests 
We need to investigate these more in the future, but let's skip them for now
so we can see some better signaling.
 2018-09-13 10:33:59 -04:00
rallytime
8e74d1c9e4
Skip some unreliable tests 
We need to investigate these more in the future, but let's skip them for now
so we can see some better signaling.
 2018-09-13 10:31:08 -04:00
Nicole Thomas
e319ecc9f6
Merge pull request #49629 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.3 to 2018.3
 2018-09-13 10:00:07 -04:00
Gareth J. Greenaway
d11a400825
Fixing failing test under python 3.7 causaed by changes to how os.makedirs sets initial permissions. 2018-09-13 09:52:57 -04:00
Nicole Thomas
370de07617
Lint: Add extra blank line 2018-09-12 17:05:34 -04:00
Gareth J. Greenaway
27b93fcc68
Moving the test_build_whitespace_split_regex test into the TestBuildWhitespaceRegex class. 2018-09-12 14:38:10 -06:00
Gareth J. Greenaway
588f744493
Fixing failing test under python 3.7 causaed by changes to how os.makedirs sets initial permissions. 2018-09-12 14:25:57 -06:00
rallytime
b628ad729b
Merge branch '2018.3.3' into '2018.3' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-09-12 12:35:00 -04:00
Nicole Thomas
7042fc0f75
Merge pull request #49580 from garethgreenaway/fixing_failing_test_python_3_7 
[2018.3] Fixing tests for Python 3.7
 2018-09-12 12:33:35 -04:00
Daniel Wozniak
f908cde7f7
Merge branch '2018.3' into add_whitelist 2018-09-12 10:04:00 -06:00
Nicole Thomas
ab19082a7a
Merge pull request #49606 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-09-12 10:26:33 -04:00
Nicole Thomas
0ce91d60fc
Merge pull request #49620 from dwoz/nacltest 
Adding passing windows nacl runner tests to whitelist
 2018-09-12 10:19:10 -04:00
Nicole Thomas
c1f97c4733
Merge pull request #49532 from meaksh/2018.3-fix-linux_acl-recursive-problems 
Fix wrong 'recurse' behavior on for linux_acl.present/absent states
 2018-09-12 10:16:15 -04:00
Daniel A Wozniak
51500ac701
Adding passing windows nacl runner tests to whitelist 2018-09-11 16:43:00 -06:00
rallytime
0f3881ab4f
Skip flaky test on Python 3 
Even with the flaky decorator, this test sometimes passes and sometimes fails.

Let's skip it for now.
 2018-09-11 14:15:52 -04:00
rallytime
c168268229
Update old utils paths to use new paths 2018-09-11 12:54:50 -04:00
rallytime
19598d8802
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/cloud/clouds/proxmox.py
  - salt/minion.py
  - salt/modules/win_lgpo.py
  - salt/netapi/rest_tornado/__init__.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/returners/local_cache.py
  - salt/returners/rawfile_json.py
  - salt/utils/minions.py
 2018-09-11 12:51:52 -04:00
Daniel A. Wozniak
9e3b44d6af
Fix linter issues 2018-09-11 08:47:51 -07:00
Daniel A. Wozniak
ca1b05e36d
Fix multiple issues in x509 module and state 
Adding a regression test for #49008 and patching the x509 module and
state to make the test pass.
 2018-09-11 08:47:50 -07:00
Daniel A. Wozniak
e603e7a4f2
Fix encoding issues in file and x509 states 2018-09-11 08:47:50 -07:00
Daniel A. Wozniak
2959da0f99
Add some runners test files to whitelist 2018-09-11 08:38:16 -07:00
Daniel A. Wozniak
bee29024f5
Make windows file remove return like others 2018-09-11 08:37:46 -07:00
Daniel Wozniak
5e591ea474
Merge branch '2018.3' into m2crypto_test 2018-09-10 16:03:49 -07:00
Nicole Thomas
e3a14e3535
Merge pull request #49594 from rallytime/bp-49580 
Back-port #49580 to 2018.3.3
 2018-09-10 15:59:40 -04:00
Erik Johnson
729dc0819f
Kill bare excepts with fire 
These prevent the signal handlers from shutting down a process via a
raising a SystemExit. They are ticking time bombs of race conditions
that leave processes running when daemons are shut down or restarted.

Friends don't let friends use bare excepts.
 2018-09-10 13:19:03 -06:00
Daniel A. Wozniak
5770b05612
Fix hitelist file order 2018-09-10 10:05:43 -07:00
Daniel A. Wozniak
10ec8beb39
Fix linter issues 2018-09-10 10:00:25 -07:00
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
Daniel A Wozniak
ccbcb5588a
Add more tests to whitelist for Windows 2018-09-10 09:34:27 -07:00
rallytime
5de2245c11
Update old utils paths to use new utils paths 2018-09-10 09:14:24 -04:00
Nicole Thomas
9004422d84
Merge pull request #49571 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-09-10 08:58:14 -04:00
Daniel Wozniak
faafe74a68
Merge branch '2018.3' into m2crypto_test 2018-09-07 22:58:54 -07:00
Gareth J. Greenaway
b6afdae7c9
Fixing lint. 2018-09-07 20:17:00 -07:00
Gareth J. Greenaway
d2fb68c8ed
Fixes various tests that were failing under python 3.7. 2018-09-07 20:17:00 -07:00
Daniel A. Wozniak
dbe40df7de
Increase timeout for flaky git test 2018-09-07 16:46:34 -07:00
Daniel A Wozniak
aa07b3fa43
Multiple unittest fixes for 2018.3 Python 3 Windows 2018-09-07 15:16:56 -07:00
rallytime
a00aba9192
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-09-07 16:19:19 -04:00
Nicole Thomas
8b971e5e5a
Merge pull request #49533 from silenius/2018.3.3 
[cherry-pick] Optimize postgres groups management
 2018-09-07 14:58:56 -04:00
Nicole Thomas
1a41b473ce
Merge pull request #49543 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-09-07 14:19:31 -04:00
Ch3LL
d520f9acc1
Add tests with filname in token data 2018-09-07 13:55:26 -04:00
Ch3LL
d45f6c7866
Add empty token salt-api integration tests 2018-09-07 13:55:26 -04:00
Daniel A. Wozniak
abc9c1acb5
Fix linter issues 2018-09-07 08:03:29 -07:00
Daniel A. Wozniak
8e42384342
Fix multiple issues in x509 module and state 
Adding a regression test for #49008 and patching the x509 module and
state to make the test pass.
 2018-09-07 07:46:10 -07:00