Gareth J. Greenaway
3d52b26cbd
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save
2019-02-14 07:20:19 -08: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
Shane Lee
1206a94006
Merge branch '2018.3' into fix_51566
2019-02-13 17:00:53 -07:00
twangboy
11681412af
Add test for explicit lists
2019-02-13 16:59:07 -07:00
Shane Lee
ddc017c857
Merge branch '2018.3' into add_tests_51534
2019-02-13 15:33:28 -07:00
twangboy
9e3a01b930
Use existing file instead of tzutil
2019-02-13 15:32:16 -07:00
twangboy
30c18324a4
Use tempfile to get temp dir
2019-02-13 12:40:19 -07:00
twangboy
e3d3c5a8e2
Add tests for issue 51309
2019-02-13 12:22:36 -07:00
Gareth J. Greenaway
0760133336
adding integration.scheduler.test_helpers to various files to by pass the test_module_name_source_match check.
2019-02-13 09:27:55 -08: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
6b1a2016db
Merge branch '2018.3' into 51069-ri-and-rdoc-removed
2019-02-13 01:57:14 -07:00
Daniel Wozniak
fdb13a3a91
Merge pull request #51523 from lomeroe/solarisips_fixes
...
Bugfixes in solarisips
2019-02-13 01:14:45 -07:00
Daniel Wozniak
e3d5fbe947
Merge pull request #51577 from garethgreenaway/merge-2017.7
...
[2018.3] Merge forward from 2017.7 to 2018.3
2019-02-13 01:11:10 -07:00
Daniel Wozniak
e8e91e3b27
Merge branch '2018.3' into solarisips_fixes
2019-02-12 21:22:15 -07:00
Daniel Wozniak
c34967dd22
Merge branch '2018.3' into test-zypp-plugin
2019-02-12 18:04:39 -07: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
25b2ca677f
Merge branch '2018.3' into merge-2017.7
2019-02-12 09:30:04 -08:00
Benjamin Drung
7678c28be7
Do not load zyppnotify file on module import
...
The call imp.load_source() could fail (i.e. when the specified
zyppnotify does not exist). To prevent an import failure in that case,
move the loading of the zyppnotify file into the test case.
Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2019-02-12 11:25:24 +01:00
Daniel A. Wozniak
cbac390a7d
Use the code directory instead of cwd for python path
2019-02-11 17:13:07 -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
84e15cedf9
Fixing lint
2019-02-11 10:57:08 -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
Daniel Wozniak
f7d50b13b4
Merge pull request #50784 from sathieu/dynamic_file_roots
...
Allow dynamic file_roots
2019-02-08 11:09:39 -07:00
twangboy
7771632adc
Fix ssh on Windows
2019-02-07 10:07:01 -07:00
lomeroe
b7bfe1766b
lint fixes
2019-02-07 10:52:41 -06:00
lomeroe
cdaccf4679
add tests to validate command being sent to cmd.run_all
2019-02-07 10:52:41 -06:00
lomeroe
eaa229dde5
add unit test
2019-02-07 10:52:41 -06:00
Gareth J. Greenaway
d31c902931
Updating the mysql module to handle MariDB versions.
2019-02-07 11:19:02 +01:00
Mathieu Parent
7ca2aa4919
Allow dynamic file_roots
...
Fixes : #48132
2019-02-06 21:33:11 +01:00
twangboy
b6acc92e87
Backport 51095
2019-02-06 11:58:57 -07:00
Daniel Wozniak
1f981c62ac
Merge pull request #51429 from yosnoop/replace-noclass-with-nocl-for-dig
...
The +nocl is supported much wider than +noclass
2019-02-06 10:48:47 -07:00
Daniel Wozniak
209ef32049
Merge pull request #51441 from Ch3LL/bp-51366
...
Backport #51366 into 2018.3.4
2019-02-06 10:42:18 -07:00
Ty Hahn
5231e73559
Merge branch '2018.3.4' into replace-noclass-with-nocl-for-dig
2019-02-04 15:03:48 +09:00
Pedro Algarvio
c9f6b019cb
Merge branch '2018.3.4' into fix_test_win_dns_client
2019-02-03 22:03:20 +00:00
Ty Hahn
14e6fb758f
In case the test machine can't resolve
...
With -v option, dig does not attemp to resolve while verifying all the given
options.
2019-02-03 23:10:37 +09:00
Ty Hahn
a00d708441
Test dig options for salt.utils.dns.lookup
2019-02-03 23:01:39 +09: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
Anton Zhabolenko
d3ef2cb8e6
Merge branch '2018.3.4' into fix-insecure-sql-queries-in-mysql-module-1
2019-02-01 19:56:06 +03:00
Anton Zhabolenko
ed62a2f873
Fix insecure SQL queries in mysql.user_chpass
2019-02-01 13:07:25 +03: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
Lee Webb
f339608a88
Merge branch '2018.3' into 51069-ri-and-rdoc-removed
2019-02-01 11:25:19 +11: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
5bc466e5e4
Fix python 3 path for shell test cases
2019-01-30 17:05:17 -05:00
