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
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
Daniel A. Wozniak
5351e5c459
Add testing path to run_script commands
2019-01-30 17:05:10 -05:00
Daniel A. Wozniak
2d8a3641bc
Fix linter issues
2019-01-30 17:05:03 -05:00
Daniel A. Wozniak
9b8718a1d5
Cloud provider and profile configs are merged
2019-01-30 17:04:50 -05:00
Gareth J. Greenaway
bd41ff0f59
Fixing various bits in x509 module and unit test to ensure tests are passing on python2 & python3
2019-01-30 11:01:06 -05:00
Daniel A. Wozniak
3f4c5a3e2d
Merge branch 'cloud_config_2017' of github.com:dwoz/salt into cloud_config_2017
2019-01-30 03:17:27 -07:00
Daniel A. Wozniak
7bb4ceb620
Fix python 3 path for shell test cases
2019-01-30 03:15:41 -07:00
Daniel A. Wozniak
ae351eb055
Fix python 3 path for shell test cases
2019-01-30 03:13:21 -07:00
Daniel Wozniak
8b8d41aa19
Merge branch '2017.7' into cloud_config_2017
2019-01-29 19:45:05 -07:00
Daniel Wozniak
48062c89a7
Merge branch '2018.3' into cloud_config_merge
2019-01-29 19:43:26 -07:00
Daniel A. Wozniak
eeea289806
Add testing path to run_script commands
2019-01-29 19:38:46 -07:00
Daniel Wozniak
21359e69e8
Merge branch '2017.7' into win_test_fix
2019-01-29 19:37:50 -07:00
Daniel A. Wozniak
bac652f439
Add testing path to run_script commands
2019-01-29 17:52:42 -07:00
Daniel A. Wozniak
77fdf35e3c
Add testing path to run_script commands
2019-01-29 17:26:04 -07: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
