Daniel Wozniak
e8e91e3b27
Merge branch '2018.3' into solarisips_fixes
2019-02-12 21:22:15 -07: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
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
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
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
Anton Zhabolenko
ed62a2f873
Fix insecure SQL queries in mysql.user_chpass
2019-02-01 13:07:25 +03: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 Wozniak
48062c89a7
Merge branch '2018.3' into cloud_config_merge
2019-01-29 19:43:26 -07:00
Pedro Algarvio
04eb66bc8e
Merge branch '2018.3' into issue51255
2019-01-28 23:19:04 +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
Erik Johnson
ad17ac591c
Fix mocks to reflect changes to git.latest state
2019-01-28 10:46:26 -06:00
Daniel Wozniak
fdf2cf4893
Merge pull request #51250 from yosnoop/fix-salt-utils-dns-lookup
...
Fix broken lookup in salt/utils/dns.py
2019-01-27 16:53:52 -07:00
Daniel Wozniak
4e855050e8
Merge branch '2018.3.4' into bp-51170
2019-01-27 16:44:10 -07:00
Daniel Wozniak
7908875bc0
Merge pull request #51341 from Ch3LL/bp-51299
...
Backport #51299 into 2018.3
2019-01-27 16:43:35 -07:00
Ty Hahn
9fb4abea3f
Merge branch '2018.3' into fix-salt-utils-dns-lookup
2019-01-26 05:31:46 +09:00
Wayne Werner
e3080f10d6
Add sleep before sending stop over UDP
...
UDP packets are unordered - and apparently on Mac it's pretty easy for
the stop message to come before the last message we're trying to test
with. This has us wait a tenth of a second more before we tell the test
thing to stop.
Signed-off-by: Wayne Werner <wwerner@saltstack.com>
2019-01-25 14:48:40 -05:00
Daniel A. Wozniak
c893dc445a
Fix saltmod roster test
2019-01-25 14:32:58 -05:00
Daniel A. Wozniak
484bab4399
Fix linter
2019-01-25 14:32:42 -05:00
Daniel A. Wozniak
5e2db2f7af
Honor roster file for ssh orchestrations
2019-01-25 14:32:36 -05:00
Pedro Algarvio
da3aace317
Merge branch '2018.3.4' into hotfix/fix-network
2019-01-25 15:14:24 +00:00
Pedro Algarvio
f6babeb915
Remove unused imports
2019-01-25 13:00:03 +00:00
Pedro Algarvio
ff6824c682
Don't fail the test because of order
2019-01-25 13:00:03 +00:00
Pedro Algarvio
4d12ccbb1a
Show objects on assertion failure
2019-01-25 13:00:03 +00:00
Pedro Algarvio
78c6d68008
Run tests from tox, wether runtests or pytest
2019-01-25 13:00:02 +00:00
Pedro Algarvio
bd7072f3c8
Merge branch '2018.3' into 1257_something_something_bytes_argh_python2
2019-01-25 09:34:49 +00:00
Gareth J. Greenaway
0e542c5515
Fixing various bits in x509 module and unit test to ensure tests are passing on python2 & python3
2019-01-24 16:41:49 -08:00
Gareth J. Greenaway
c847f54293
Swap passed addr for string rather than ipaddress object.
2019-01-24 15:04:27 -08:00
Gareth J. Greenaway
87f3972606
removing another debugging log.
2019-01-24 14:52:31 -08:00
Gareth J. Greenaway
ad64efbabe
Use MagicMock
2019-01-24 14:51:17 -08:00
Gareth J. Greenaway
5812eae808
Adding a test to ensure dns_check works as expected.
2019-01-24 14:48:41 -08:00
twangboy
f4177e0adb
Remove mode parameter on Windows
2019-01-24 10:11:48 -07:00
Ty Hahn
9a34bcda10
Unit test for lookup with servers option
2019-01-24 22:14:30 +09:00
Ty Hahn
af867e14dc
Remove excessive whitespaces
2019-01-24 21:32:46 +09:00
Ty Hahn
0d074a4f2e
Fix a comment
2019-01-24 21:32:46 +09:00
Gareth J. Greenaway
53ba0689a8
When test=True and there are permissions changes, report it.
2019-01-23 14:06:31 -05:00
Pedro Algarvio
04f16b8c91
Fix tests. We no longer get ipaddress instances back.
2019-01-23 18:07:25 +00:00
Pedro Algarvio
aacc047686
Merge pull request #51274 from twangboy/fix_network
...
Fix minion start issue
2019-01-23 18:03:02 +00:00
