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
96,352 Commits 24 Branches 182 Tags 341 MiB
8111479346
Commit Graph

5143 Commits

Author SHA1 Message Date
Daniel Wozniak
8111479346
Merge branch '2018.3' into merge-2018.3.4 2019-02-20 01:13:19 -07:00
Daniel Wallace
d59952fce6
Merge branch '2018.3' into virtualnames 2019-02-19 16:59:42 -06:00
Daniel A. Wozniak
fab74bb78d
Fix ruby gems tests, again 2019-02-19 14:11:39 -07:00
Daniel A. Wozniak
b5a626590c
Fix ruby gems tests, again 2019-02-19 14:04:45 -07:00
Daniel Wallace
33bb5bfe69
fix use of virtualname 
Make sure that the virtualname is included in the actual filename of
core modules.  This will help speed up loading of modules that need to
use the virtualname, so that we hit @depends decorators less.
 2019-02-19 13:16:06 -06:00
Shane Lee
5a98fb9751
Merge branch '2018.3' into lgpo_boolean_element_fix 2019-02-14 13:35:19 -07:00
Gareth J. Greenaway
fbacb35424
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save 2019-02-14 09:00:50 -08:00
Shane Lee
9c964efa5a
Merge branch '2018.3' into increase_wait_2018.3 2019-02-14 09:31:14 -07:00
Gareth J. Greenaway
3d52b26cbd
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save 2019-02-14 07:20:19 -08:00
Daniel A. Wozniak
918030e48d
Increase minion wait for slow boxes 2019-02-14 02:00:28 -07:00
Daniel A. Wozniak
1087d10bea
increase batch test timeout on windows 2019-02-14 01:25:40 -07:00
Daniel Wozniak
dadf414700
Merge pull request #51637 from twangboy/backport_50887_2018.3 
backport #50887
 2019-02-13 20:03:03 -07:00
Gareth J. Greenaway
deeefc728b
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save 2019-02-13 18:38:54 -08:00
twangboy
d8d2b863a5
backport #50887 2019-02-13 17:31:13 -07:00
twangboy
11681412af
Add test for explicit lists 2019-02-13 16:59:07 -07:00
lomeroe
5ed8eb648e Properly create the value for a "True" boolean element item 
Closes #51634
 2019-02-13 15:24:45 -06:00
Gareth J. Greenaway
1552fba0bc
lint cleanup 2019-02-13 09:27:55 -08:00
Gareth J. Greenaway
086066b75f
Adding a test to ensure _get_schedule which is used by the save functionality works when there is an enabled attribute. 2019-02-13 09:27:55 -08:00
Daniel Wozniak
e060b979a4
Merge branch '2018.3' into merge-2017.7 2019-02-12 17:56:53 -07:00
Daniel A. Wozniak
d794edb515
fix linter 2019-02-12 12:02:55 -07:00
Daniel A. Wozniak
d6720d2d14
Wait for minions to be pingable before starting tests 2019-02-12 12:02:48 -07:00
Gareth J. Greenaway
c337fcee4c
Merge branch '2018.3' into merge-2017.7 2019-02-11 14:51:33 -08:00
Gareth J. Greenaway
e891b3f515
Merge branch '2018.3.4' into merge-2018.3.4 
Conflicts:
	tests/integration/states/test_file.py
	tests/unit/states/test_file.py
	tests/unit/utils/test_dns.py
 2019-02-11 10:46:53 -08:00
Gareth J. Greenaway
a04177518f
Merge branch '2017.7' into merge-2017.7 
Conflicts:
	salt/modules/pillar.py
	salt/states/pip_state.py
	salt/utils/data.py
	tests/unit/modules/inspectlib/test_fsdb.py
	tests/unit/output/test_json_out.py
	tests/unit/test_test_module_names.py
 2019-02-11 09:01:46 -08:00
twangboy
7771632adc
Fix ssh on Windows 2019-02-07 10:07:01 -07:00
twangboy
33922c93c6
Fix the failing dns test on Windows 
Gets the name of the first interface on the system. Windows network
interfaces don't have the same name across Window systems. YOu can even
go as far as naming them whatever you want. The test was failing because
the interface name was hard-coded as 'Ethernet'.
 2019-02-01 13:52:39 -07:00
Erik Johnson
a35c023fdc
Don't use a decorator that assumes /etc/apt/sources.list.d exists 
This will make the test fail on most platforms
 2019-01-31 19:47:11 -06:00
Erik Johnson
6a62e7912a
Add integration test for architecture support 2019-01-31 16:12:51 -06:00
Erik Johnson
191235d8d3
Remove custom grains module from 2018.3 branch 
Support for passing the grains data to custom grains modules wasn't
added until the 2019.2 release cycle. It seems like this file was
included when something else was backported to 2018.3.
 2019-01-31 09:10:45 -06:00
Daniel A. Wozniak
43ac36e5ff
Use gems.github.com no longer exists, use gemcutter.org 2019-01-29 14:24:27 -07:00
Erik Johnson
3cec85e725
Normalize results if test proxy is enabled 2019-01-29 12:58:24 -06:00
Pedro Algarvio
f4e169255b
Fix test 2019-01-28 20:37:05 +00:00
Daniel Wozniak
43a9d2f972
Merge pull request #51338 from Ch3LL/bp-51207 
Backport #51207 into 2018.3.4
 2019-01-27 16:44:58 -07:00
Daniel A. Wozniak
e74a6c61de
Fix py3 managed.file test failure 2019-01-25 14:42:50 -05:00
Daniel A. Wozniak
824950c4cd
Fix 50221 regression test on Windows 2019-01-25 14:42:38 -05:00
Daniel A. Wozniak
1840af9c00
peserve newlines from pillar data for file.managed 2019-01-25 14:42:32 -05:00
twangboy
345ae676b6
Backport PR# 50771 to 2018.3 branch 2019-01-25 14:38:30 -05:00
Pedro Algarvio
ff6824c682
Don't fail the test because of order 2019-01-25 13:00:03 +00:00
Pedro Algarvio
0281fc5b50
Don't fail the test because of order 2019-01-24 16:58:42 +00:00
Pedro Algarvio
d4ab6d815b
Merge branch '2018.3' into fix_test_pkg 2019-01-24 11:39:57 +00:00
Daniel A. Wozniak
a5255f0eb2
Merge remote-tracking branch 'saltstack/2018.3' into issue-50221 2019-01-23 08:26:20 -07:00
Daniel A. Wozniak
c1ea10f090
Fix py3 managed.file test failure 2019-01-22 10:46:32 -07:00
Daniel A. Wozniak
ac978f0647
Fix 50221 regression test on Windows 2019-01-19 18:21:27 -07:00
Daniel A. Wozniak
65f38b5ab2
peserve newlines from pillar data for file.managed 2019-01-19 16:11:49 -07:00
Gareth J. Greenaway
a233dbc79a
Ensuring we can handle a string that contains single quote + an escaped double quote. 2019-01-18 12:45:09 -08:00
twangboy
b91b2c62f5
Backport PR# 50771 to 2018.3 branch 2019-01-16 15:54:17 -07:00
Pedro Algarvio
b348ace640 Make sure blackout tests clean up after themselves. Properly. 
(cherry picked from commit 9ab0e98e2c)
 2019-01-15 16:31:35 +00:00
Pedro Algarvio
68a12d50d0 These should not be considered destructive tests 
(cherry picked from commit 479439ab99)
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
71c357414d Revert "backport test improvements from develop" 
This reverts commit 0af7653dfa3fc9b30601dec2c8ac2ce3cba52e7f.

I guess that was way too optimistic.
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
e32d219599 backport test improvements from develop 
Bogus random test failures
forklifted from develop at 414bfe61a4
 2019-01-15 16:31:35 +00:00