valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
96,352 Commits 24 Branches 182 Tags 341 MiB
8111479346
Commit Graph

5143 Commits

Author SHA1 Message Date
Gareth J. Greenaway
45f363b152
Fixing various lint errors. 2018-12-20 16:19:01 -08:00
Gareth J. Greenaway
bcf8f06aa4
fixing lint 2018-12-18 16:48:14 -08:00
Gareth J. Greenaway
543ec7bc79
Ensure source_hash returned from get_source_sum is lowercase. 2018-12-18 16:51:26 -07:00
Mike Place
9f8289be9c
Merge pull request #50692 from terminalmage/update-tests 
Update a couple test modules to use with_tempdir/with_tempfile decorators
 2018-12-10 10:24:02 -07:00
Mathieu Parent
e9714126ac
git_pillar: Add support for all_saltenvs parameter 
On the road to #32245.
 2018-12-05 20:56:29 +01:00
Mathieu Parent
5423c27f84
git_pillar: Allow root and mountpoint parameters together 
Fixes: #50364
 2018-12-05 05:20:04 +01:00
Erik Johnson
be14517c5c
Make x509 tests use tempfiles instead of hard-coding them 
This keeps us from needing to manually clean them up in the tearDown
 2018-12-03 13:13:14 -06:00
Erik Johnson
a394cd76f6
Update file integration tests to use decorator for tempdirs 2018-11-29 09:29:23 -06:00
Gareth J. Greenaway
2f6dac917b
Updating test_maxrunning_master to Mock get_running_jobs. 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
44940d6c23
Ensure minion tests using minion options. 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
722be433c2
Fixing lint 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
65b44214d4
Adding some master specific functions to uitls/masters.py to determine if a Salt process is running. Updating utils/schedule.py to use the appropriate running function either from utils/master.py or utils/minion.py depending on where the scheduled job is running. Adding tests to test maxrunning in scheduled jobs for both the minion and master. 2018-11-23 17:07:16 -08:00
Daniel Wozniak
60b4622570
Merge pull request #50366 from jdsieci/2018.3-fix-issue50254 
2018.3 fix issue50254
 2018-11-20 13:31:29 -07:00
Gareth J. Greenaway
4c85119a57
merge-forward 2017.7 to 2018.3 2018-11-19 10:39:38 -08:00
Mathieu Parent
12ea1cc01e
git_pillar: Add tests for mountpoint parameter 
(cherry picked from commit 6e2f4e471d08fcc29ce144af6dcd605b85644522)
 2018-11-16 06:07:24 +01:00
Mathieu Parent
fce467e438
git_pillar: Add tests for root parameter 
(cherry picked from commit 2e88b74816)
 2018-11-16 06:07:24 +01:00
Brett Benassi
009e52d4b9
Adding tag to ec2 cloud tests 2018-11-15 15:36:05 -07:00
Ch3LL
178dab3a4b
Merge branch 2017.7 into 2018.3 
Conflicts:
  - doc/topics/tutorials/salt_bootstrap.rst
  - tests/integration/cloud/clouds/test_digitalocean.py
 2018-11-14 10:33:44 -05:00
Mike Place
c1dde7e9b1
Merge pull request #50328 from rallytime/fix-48734 
Fix issue with salt-run jobs.list_jobs where Target: unknown-target
 2018-11-13 12:49:57 -07:00
Nicole Thomas
c00fd43ee9
Merge pull request #50493 from rallytime/bp-50362 
Back-port #50362 to 2017.7
 2018-11-13 11:59:50 -05:00
twangboy
60559cfa8a
Remove flaky test 2018-11-13 09:25:47 -05:00
twangboy
a696a8f564
Fix test_matcher on Windows 
Fixes a timeout issue in test_salt_documentation_arguments_not_assumed
 2018-11-13 09:25:41 -05:00
Nicole Thomas
917781dc95
Lint: Add blank line 2018-11-12 17:47:46 -05:00
rallytime
1517bb31a8
Update old utils paths to use new paths 2018-11-12 16:13:35 -05:00
rallytime
d8e7c47a05
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/support/case.py
 2018-11-12 16:11:17 -05:00
Ch3LL
3583519da4
Update digital ocean location for cloud tests 2018-11-12 15:52:32 -05:00
Nicole Thomas
b16ff9cd1c
Merge pull request #50469 from dwoz/minion_timeout_test 
Fix up integration.minion.test_timeout
 2018-11-12 11:53:45 -05:00
Daniel A. Wozniak
794ba17c94
Reset date and time after changing 2018-11-12 00:43:22 -07:00
Daniel A. Wozniak
686153a77c
Fix up integration.minion.test_timeout 
This test wasn't able to be run on it's own. Fix it and add more
debugging
 2018-11-11 21:30:08 -07:00
rallytime
2c51cf9816
Make target test job more specific to reduce test flakiness 2018-11-08 10:27:41 -05:00
rallytime
caace3f184
Rewrite job cache target test to be more robust 2018-11-07 17:01:06 -05:00
Pablo Suárez Hernández
71af32d31a
Remove unicode references 2018-11-07 16:55:55 +00:00
Pablo Suárez Hernández
b7af5e52c5
Test git ext_pillar across multiple repos using __env__ 2018-11-07 16:33:03 +00:00
rallytime
e993692d01
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/master.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - tests/integration/cli/test_batch.py
 2018-11-05 12:54:30 -05:00
Daniel A. Wozniak
18b5d43d09
Increase cli batch test timeout for increased reliablity 2018-11-02 17:15:31 -07:00
Jerzy Drozdz
1ab59e7e48 Added integration tests 2018-11-02 23:02:04 +01:00
Gareth J. Greenaway
8885d1ff3d
Merge branch '2018.3' into 41342_beacon_state_module_fixes 2018-11-02 12:08:19 -07:00
lomeroe
0e011ad805 add runTest method to class for PY2 2018-11-02 08:03:43 -05:00
lomeroe
377ec095ab add a test for #47784 2018-11-02 08:03:43 -05:00
lomeroe
0a14505e21 change backslashes in comment string to fix lint error 2018-11-02 08:03:43 -05:00
lomeroe
02181d385a add fix/test for #50079 
ADML display names that have a single match in each Computer/User policy
would not work with the "short" display name, requiring either the
"long" name or the explicit policy name
 2018-11-02 08:03:43 -05:00
lomeroe
05f29511a4 more lint fixes 2018-11-02 08:03:43 -05:00
lomeroe
94b33350a8 lint fixes in test 2018-11-02 08:03:43 -05:00
lomeroe
2a79626538 update test to actually work 
update lgpo module to catch another possible case of multiple ADML names
 2018-11-02 08:03:43 -05:00
lomeroe
42840ecd9b add missing comma in function call 2018-11-02 08:03:43 -05:00
lomeroe
c283f50074 Log a warning message instead of an exception when a SID cannot be 
converted to a username (for user rights assignments)

Add a module test file
 2018-11-02 08:03:43 -05:00
Brett Benassi
346a8317b1
Updating the AMI's and sizes for the test run. 2018-11-01 19:05:49 -06:00
Gareth J. Greenaway
c2354a9cb1
Fixing beacon state test. Adding a reset function to beacon module to clear out beacon configuration. Useful for tests runs to ensure bits are left over between runs. 2018-11-01 16:47:02 -07:00
Gareth J. Greenaway
2390f471ce
Adding SaltReturnAssertsMixin back in 2018-11-01 15:22:18 -07:00
Gareth J. Greenaway
677d0908fd
Remove zookeeper reference. 2018-11-01 15:05:42 -07:00
Gareth J. Greenaway
f3dee43bf0
Updating the beacon state module to ensure that the format of the beacon data that is being sent along to the beacon execution module is in the right format. 2018-11-01 15:02:21 -07:00
rallytime
b29fcfabbb
New test must be py3 compatible...oops. :) 2018-10-31 12:52:58 -04:00
rallytime
6859e0e6e2
Add regression test for issue #48734 2018-10-31 12:03:14 -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
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
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
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
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
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
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
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
d8d8559b75
Fixing lint 2018-10-23 19:09:02 -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
f2e55128bb
Evan Moar Lint 2018-10-23 14:48:32 -05:00
Erik Johnson
39c245525f
Lint 2018-10-23 14:48:31 -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
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
6d9c2eb6b0
Move jinja templating tests alongside salt/utils/jinja.py's tests 2018-10-23 14:28:45 -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
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
Gareth J. Greenaway
adb1e79723
Apply scheduler fixes and tests from #49104 to 2018.3 2018-10-18 08:27:59 -07: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
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
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
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
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
Daniel A. Wozniak
e5ea3f1956
Try running fsync to avoid fs caching race condition 2018-10-06 12:49:49 -07: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
1005b91690
Debug win_pkg 2018-10-04 15:34:10 -07:00