Daniel Wozniak
4abd9d0462
Merge branch '2019.2' into merge-2018.3
2019-02-13 01:12:52 -07:00
Daniel Wozniak
b00e7e8b09
Merge branch '2019.2' into merge-2019.2.0rc1
2019-02-12 17:55:02 -07:00
Daniel A. Wozniak
ab0a6a38e5
fix linter
2019-02-12 12:04:37 -07:00
Daniel A. Wozniak
f2e4a30916
Wait for minions to be pingable before starting tests
2019-02-12 12:04:34 -07:00
Gareth J. Greenaway
6c99cb161f
Merge branch '2018.3' into merge-2018.3
...
Conflicts:
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-proxy.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
doc/man/spm.1
pkg/osx/build_env.sh
salt/utils/dns.py
tests/integration/netapi/rest_tornado/test_app.py
tests/support/case.py
tests/unit/utils/test_dns.py
2019-02-11 15:45:43 -08:00
Daniel A. Wozniak
dbf4356aac
Use the code directory instead of cwd for python path
2019-02-11 14:47:19 -07:00
Daniel A. Wozniak
e49ba862cf
Add testing path to run_script commands
2019-02-11 14:13:25 -07:00
Gareth J. Greenaway
6e55164416
Merge branch '2019.2.0.rc1' into merge-2019.2.0rc1
...
Conflicts:
Gemfile
2019-02-11 11:27:20 -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
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
9a5d07673b
Add Windows Server 2019
2019-02-07 10:27:23 -07:00
twangboy
7771632adc
Fix ssh on Windows
2019-02-07 10:07:01 -07: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
Gareth J. Greenaway
02face5ead
Merge branch '2019.2.0.rc1' into backport_51095_2019.2.0.rc1
2019-02-06 13:19:40 -07:00
twangboy
227f949f4e
Backport 51095
2019-02-06 12:00:35 -07:00
twangboy
b6acc92e87
Backport 51095
2019-02-06 11:58:57 -07:00
Daniel A. Wozniak
d021773170
Add testing path to run_script commands
2019-02-06 11:00:43 -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
Erik Johnson
4551ae1e3f
Fix invocation of user.list_users in test suite
...
This function does not take an argument, so this causes a traceback in
the tearDown.
2019-02-05 09:29:52 -06: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
9c9e564d51
Fix the failing dns test on Windows
2019-02-01 13:58:58 -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
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
Alberto Planas
467daf2e4c
parted: support variable length output for print
...
The command print from parted have a variable lenght output,
depending on the units requested, or the kind of partition.
This patch add the logic to support the full range of outputs
that parted 3.1, and early versions, are generating.
(cherry picked from commit 5adf859e3f
2019-01-30 13:44:27 +01:00
Daniel A. Wozniak
ae351eb055
Fix python 3 path for shell test cases
2019-01-30 03:13:21 -07:00
Alberto Planas
da2e632566
parted: fix the ordering of list command
...
The command `parted -m -s {} print` do not print the "Type" column,
but after the "File System" column print the name of the partition.
This point that the type of the partition cannot be extracted using
parted with machine parseable output.
(cherry picked from commit f23d618e11
2019-01-30 11:02:26 +01: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 A. Wozniak
77fdf35e3c
Add testing path to run_script commands
2019-01-29 17:26:04 -07:00
Erik Johnson
3cec85e725
Normalize results if test proxy is enabled
2019-01-29 12:58:24 -06:00
Megan Wilhite
8acd9e5da2
Merge pull request #51368 from s0undt3ch/hotfix/tests
...
Fix test
2019-01-29 12:36:48 -05:00
Pedro Algarvio
04eb66bc8e
Merge branch '2018.3' into issue51255
2019-01-28 23:19:04 +00:00
Pedro Algarvio
f4e169255b
Fix test
2019-01-28 20:37:05 +00:00
Daniel A. Wozniak
542d85713b
Fix linter issues
2019-01-28 10:32:00 -07:00
Daniel A. Wozniak
a8af3baed2
Cloud provider and profile configs are merged
2019-01-28 10:20:54 -07:00
