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

95088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nicole Thomas
5f904dd5c5
Merge pull request #50174 from rallytime/bp-50146 
Back-port #50146 to 2018.3
 2018-10-23 14:16:44 -04:00
Mike Place
1cd033935e
Merge pull request #50173 from rallytime/bp-50143 
Back-port #50143 to 2018.3
 2018-10-23 11:13:54 -06:00
Michael Lustfield
601a5b83fc
Improve handling of non-ascii characters in terminal output. (Fixes: #49523) 2018-10-23 10:32:51 -04:00
m03
f5d6080237
Add test_to_none 2018-10-23 10:30:31 -04:00
m03
c0ce36b918
Fix #50142, stringutils.to_none 2018-10-23 10:30:28 -04:00
Nicole Thomas
9331f1e920
Merge pull request #50171 from terminalmage/docs 
Fix invalid RST link in docker_network docs
 2018-10-23 09:40:35 -04:00
Nicole Thomas
16eece35c7
Merge pull request #50161 from rmarcinik/patch-1 
Add a missing result for task.info
 2018-10-23 09:31:42 -04:00
Erik Johnson
7ea1d6cdd3
Fix invalid RST link in docker_network docs 2018-10-23 08:24:24 -05:00
Rigel Marcinik
9848f0692a
Add a missing result for task.info 
There is a possible value for Last Run Result in the windows task scheduler that is missing from the results dictionary.  It raises a confusing KeyError from task.info if the task ends up in this state.
 2018-10-22 14:23:20 -05:00
Mike Place
28bc5e351f
Merge pull request #50136 from terminalmage/debug-logging 
Add some debug logging before and after states gather pillar data
 2018-10-22 08:40:38 -06:00
Mike Place
593c7ff085
Merge pull request #50147 from garethgreenaway/50129_network_get_route_fails_dash_in_name 
[2018.3] Fix to modules/network.py
 2018-10-22 08:31:02 -06:00
Mike Place
5c7a7d97aa
Merge pull request #50156 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-10-22 08:24:38 -06:00
rallytime
87e20fd9a0
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-22 10:15:39 -04:00
Daniel Wallace
ce375f4ac3
Merge pull request #50148 from MTecknology/proxmox-fixups 
Proxmox fixups
 2018-10-22 06:55:09 -05:00
Gareth J. Greenaway
8fa87e3dc9
Update test_network.py 2018-10-21 08:39:29 -07:00
Daniel Wallace
1a90c4fde2
Merge pull request #50144 from dwoz/winrm_fs_release 
Use newest winrm-fs release
 2018-10-20 19:53:36 -05:00
Michael Lustfield
49599475b1
Race condition still exists at one second timeout. 2018-10-20 19:27:58 -05:00
Michael Lustfield
3a62f74758
Add support for setting root ssh pubkey to proxmox containers. 2018-10-20 19:03:40 -05: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 A. Wozniak
0951d85433
Use newest winrm-fs release 2018-10-20 14:22:55 -07:00
Erik Johnson
8592a0b90e
Add some debug logging before and after states gather pillar data 
This will help definitively identify instances where a salt-call is
delayed because it is waiting for pillar data from the master.
 2018-10-19 15:09:50 -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
Mike Place
0069247ddf
Merge pull request #49980 from twangboy/lgpo_add_printer_drivers 
Add support for AddPrinterDrivers
 2018-10-19 07:19:40 -06: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
Mike Place
e892042a67
Merge pull request #50119 from terminalmage/boto-tests 
Squelch spurious errors logged in unit tests
 2018-10-19 05:42:30 -06:00
Mike Place
35449b4b14
Merge pull request #50120 from terminalmage/salt-jenkins-1137 
Fix bad merge conflict resolution
 2018-10-19 05:38:34 -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
Erik Johnson
1ddfd26e9f
Fix bad merge conflict resolution 
b98df6d was incorrectly merged forward into 2018.3 (or into develop,
before 2018.3 was branched). This causes failures to redeploy the thin
tarball when it has changed, under certain circumstances.

This commit fixes the problem. I'm also leaving in some changes to the
logging that I made in the course of troubleshooting this, as they make
the border between stdout and stderr more explicit, as well as adding
the shim command's retcode.
 2018-10-18 12:39:55 -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