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
86,503 Commits 24 Branches 182 Tags 341 MiB
2e00939a6e
Commit Graph

86503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
2e00939a6e
Merge pull request #48788 from Ch3LL/timezone_windows 
Add timzeone windows integration tests and fix get_zone
 2018-07-27 16:14:29 -04:00
Ch3LL
de95a6a215
add unused import to timezone test file 2018-07-27 15:42:35 -04:00
Ch3LL
22e424859e
add unused import to import 2018-07-27 15:14:14 -04:00
Ch3LL
0840fc3117
disable pylint import error 2018-07-27 14:31:36 -04:00
Nicole Thomas
8e61f3dce0
Merge pull request #48742 from frogunder/45014 
add windows integration tests for states.file
 2018-07-27 09:57:26 -04:00
Nicole Thomas
d74f47b340
Merge pull request #48795 from rallytime/fix-48417 
Update linting docs to contain .testing.pylintrc use
 2018-07-27 09:34:12 -04:00
rallytime
5123b17ffd
Update linting docs to contain .testing.pylintrc use 
The PR tests use the ``.testing.pylintrc`` file, rather than the
more restrictive ``.pylintrc`` file. This can be a point of confusion
when following the current documentation.

The docs should reference the testing file and that the Jenkins PR
tests use ``.testing.pylintrc`` instead of ``.pylintrc``.

Fixes #48417
 2018-07-27 09:09:28 -04:00
Nicole Thomas
bbea9ae936
Merge pull request #48789 from rallytime/bp-48783 
Back-port #48783 to 2017.7
 2018-07-26 17:47:48 -04:00
William Giokas
682a05bebe
Threshold was wrong 
I also removed the delta value check. It's going to be weird with the
number of runs we do, and it's also set to run on failures.
 2018-07-26 17:27:02 -04:00
William Giokas
d4ca0e3a97
test: except for OSError only 2018-07-26 17:27:02 -04:00
William Giokas
4547231909
Only run lint checks against changed files 2018-07-26 17:27:02 -04:00
Nicole Thomas
41464d4b39
Merge pull request #48731 from zer0def/virt-runner-init-args 
Fixed `enable_vnc` runner arg being passed into `seed_cmd` module arg in `virt.init`.
 2018-07-26 17:13:58 -04:00
Ch3LL
f09d1a2c7e
Add timzeon windows integration tests and fix get_zone 2018-07-26 16:44:55 -04:00
Frode Gundersen
f08058b043 Merge branch '45014' of https://github.com/frogunder/salt into 45014 2018-07-26 20:09:17 +00:00
Frode Gundersen
33c20c1ec0
fix tests 2018-07-26 20:04:51 +00:00
Nicole Thomas
169afea16a
Merge pull request #48749 from Ch3LL/logo_docs 
Update Saltstack Logo banner on docs.saltstack.com
 2018-07-25 09:05:04 -04:00
Ch3LL
73b1fc29f0
Update Saltstack Logo banner on docs.saltstack.com 2018-07-24 16:01:49 -04:00
Frode Gundersen
757fde70c6
Merge branch '2017.7' into 45014 2018-07-24 11:07:14 -06:00
Nicole Thomas
781c6a6c36
Merge pull request #48743 from rallytime/saltconf-ad-2017.7 
Update DOCBANNER with new SaltConf18 image
 2018-07-24 12:46:19 -04:00
rallytime
6df8fd8652
Update DOCBANNER with new SaltConf18 image 
And remove enterprise ad
 2018-07-24 12:44:19 -04:00
Frode Gundersen
a7a914060d
add windows integration tests for states.file 2018-07-24 16:42:07 +00:00
zer0def
a1fa081ad0 Documentation to missing parameters in virt.init runner. 2018-07-24 14:15:02 +02:00
zer0def
365ebdf539 Fixed enable_vnc runner arg being passed into seed_cmd module arg in virt.init. 2018-07-24 13:12:45 +02:00
Nicole Thomas
ce4e22224e
Merge pull request #48720 from Ch3LL/mac_file_path 
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path
 2018-07-23 18:32:56 -04:00
Nicole Thomas
4b9f037d43
Merge pull request #48719 from Ch3LL/service_mac_state 
Enable service if disabled before running state service tests
 2018-07-23 17:01:13 -04:00
Ch3LL
01d25fae19
Fix test_managed_source_hash_indifferent_case on macosx to correct tmp path 2018-07-23 15:02:27 -04:00
Ch3LL
f44a2fc349
Enable service if disabled before running state service tests 2018-07-23 14:05:31 -04:00
Mike Place
b2431eab10
Merge pull request #48715 from rallytime/flaky-tests 
[2017.7] Mark some tornado tests as flaky
 2018-07-23 11:27:12 -06:00
rallytime
7332cce567
[2017.7] Mark some tornado tests as flaky 2018-07-23 12:53:26 -04:00
Nicole Thomas
801eae3b8d
Merge pull request #48672 from frogunder/45012 
add service enabled test
 2018-07-23 11:38:48 -04:00
Mike Place
689c231d2b
Merge pull request #48691 from Ch3LL/win_repo_pkg_test 
Add windows pkg module integration tests
 2018-07-22 14:01:29 -06:00
Mike Place
83e4bba916
Merge pull request #48635 from nbraud/acme 
Bug fixes in the acme module & state
 2018-07-22 13:53:48 -06:00
Ch3LL
4b7d6d80c5
Remove unnecessary jinja in curl.sls file 2018-07-20 14:32:14 -04:00
Nicole Thomas
85991680c8
Merge pull request #48345 from twangboy/fix_48169 
Fix behavior of powercfg module and state
 2018-07-20 13:37:12 -04:00
Ch3LL
2bedadfadb
Add windows pkg module integration tests 2018-07-20 12:47:37 -04:00
Nicole Thomas
96447ce541
Merge pull request #48656 from Ch3LL/windows_ip_mod 
Add windows ip module integration tests
 2018-07-20 10:57:44 -04:00
Nicole Thomas
0c5fff3dc8
Merge pull request #48638 from twangboy/fix_vcredist 
Remove vcredist 2015 from Py3 installer
 2018-07-20 10:56:39 -04:00
Nicole Thomas
ead19725b6
Merge branch '2017.7' into fix_48169 2018-07-20 10:45:59 -04:00
Nicole Thomas
1ebd96d909
Merge pull request #48664 from Ch3LL/srv_disable_mac 
[2017.7] Fix service.disabled test for macosx
 2018-07-20 10:32:55 -04:00
Nicole Thomas
3da3cf2f3f
Merge pull request #48625 from Ch3LL/ssh_state 
Follow up to PR #48555
 2018-07-20 10:27:55 -04:00
Nicole Thomas
33812f78f1
Merge pull request #48673 from Ch3LL/mac_port 
Use different pub and ret ports for testprogram integration tests
 2018-07-20 10:11:51 -04:00
Nicole Thomas
5f6a7c4d89
Merge pull request #48675 from Ch3LL/mac_disable 
Fix mac service.disable tests
 2018-07-20 10:09:40 -04:00
Nicole Thomas
93d2f51d2b
Merge pull request #48658 from wyardley/wyardley-npm-json-output-2017 
Improve handling of json output (#43138)
 2018-07-20 10:08:33 -04:00
Nicole Thomas
3e293b0513
Merge pull request #48678 from OrlandoArcapix/fix-npm-dryrun-test 
Fix for issue #48677 - return clean npm.bootstrap on no changes
 2018-07-20 10:07:22 -04:00
Orlando Richards
851a404f6b Fix for issue #48677 - return True when no changes are to be made with npm.bootstrap with test=true 2018-07-19 22:33:39 +01:00
Nicole Thomas
07a1f6520f
Merge pull request #48580 from rallytime/fix-46884 
Don't error on retcode 0 in libcrypto.OPENSSL_init_crypto call
 2018-07-19 15:21:12 -04:00
Ch3LL
c78efab828
Fix mac service.disable tests 2018-07-19 14:15:58 -04:00
Ch3LL
87dd85a220
Use different pub and ret ports for testprogram integration tests 2018-07-19 13:07:27 -04:00
Frode Gundersen
0747f2e58a
add service enabled test 2018-07-19 16:47:56 +00:00
Ch3LL
f1fbfad387
move the disable call up in try block 2018-07-19 10:32:21 -04:00