valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
93,769 Commits 24 Branches 182 Tags 341 MiB
8935c08141
Commit Graph

93769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
8935c08141
Fixing a bug that occurs if the "enabled" key is present in the scheduler items dictionary. Adding a test to ensure scheduler runs as expected when that key is present. 2018-08-08 11:44:13 -07:00
Nicole Thomas
b87bf905c2
Merge pull request #49004 from rallytime/boto-test-2018.3 
Port #48999 to 2018.3
 2018-08-08 11:32:46 -04:00
rallytime
9f0b9a1073
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 10:44:38 -04:00
Nicole Thomas
630f61e625
Merge pull request #48987 from twangboy/fix_48786 
Fix issue with win_iis.create_cert_binding
 2018-08-08 09:29:05 -04:00
twangboy
86d0836f90
Fix issue with iterating over None 
Sometimes DnsNamesList is None or not present. It was stacktracing while
trying to iterate over it. Now it checks for non iterables.
 2018-08-07 17:56:38 -06:00
Nicole Thomas
ab1a713bc3
Merge pull request #48934 from terminalmage/issue48777 
Properly handle latin-1 encoding in file diffs
 2018-08-07 17:02:23 -04:00
Nicole Thomas
bad995462c
Merge pull request #48956 from gtmanfred/openstack 
if booted from volume, use string from image
 2018-08-07 12:39:44 -04:00
Erik Johnson
52c64e4d51
Fix to_unicode test 
Since latin-1 is not being automatically decoded, we need to explicitly
pass it on the test.
 2018-08-07 09:57:21 -05:00
Erik Johnson
e2d19f40b6
Only try latin-1 from get_diff instead of by default 2018-08-06 15:31:21 -05:00
Erik Johnson
d39fa889f3
Add stringutils.get_diff to mocks 2018-08-06 15:27:13 -05:00
Daniel Wallace
4cb1636c4b
if booted from volume, use string from image 
If cloud servers in openstack are booted with a volume as their root
partition, they do not have an image assigned to them, so they won't
have an image id.  In these cases just pass the string from node.image
to the image information about that machine.

Fixes #47766
 2018-08-06 12:06:10 -05:00
Nicole Thomas
71f587edd7
Merge pull request #48319 from gtmanfred/jid 
don't break older returners right now
 2018-08-06 09:19:42 -04:00
Nicole Thomas
1623e53ef4
Merge pull request #48941 from rallytime/bp-48912 
Back-port #48912 to 2018.3
 2018-08-06 09:09:37 -04:00
Erik Johnson
5b191c9120
Fix incorrect use of __salt__ when __utils__ is needed 2018-08-06 06:26:57 -05:00
Erik Johnson
53ba10ad5f
Skip pylint false-positives 2018-08-06 06:26:37 -05:00
msermin
3f55b2f89e
make jboss7.py compatible with 2018.3.0 and later 2018-08-05 15:55:01 -04:00
Nicole Thomas
084e7f0ef4
Merge branch '2018.3' into jid 2018-08-05 15:16:41 -04:00
Nicole Thomas
070af9d925
Merge pull request #48897 from rallytime/bp-48863 
Back-port #48863 to 2018.3
 2018-08-05 15:15:50 -04:00
Nicole Thomas
abd7f1312d
Merge pull request #48928 from Ch3LL/mac_runas 
fix test_runas integration test for macosx
 2018-08-05 10:24:12 -04:00
Nicole Thomas
dbd300ff70
Merge pull request #48899 from Ch3LL/unit_state 
remove base_top_file file in teardown and add sleep
 2018-08-05 10:23:41 -04:00
Nicole Thomas
ffa1fcc682
Merge pull request #48898 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-08-05 10:23:18 -04:00
Erik Johnson
f14f4dae22
Add unit test for latin-1 fallback, multi-encoding 2018-08-03 18:38:08 -05:00
Erik Johnson
906644a80f
PY3 scoping fix 
In PY3 the caught exceptions now drop out of scope when leaving the for
loop.
 2018-08-03 18:36:01 -05:00
Erik Johnson
726dd4331f
Add integration test for latin-1 file diffs 2018-08-03 17:30:17 -05:00
Erik Johnson
2dd1f31d23
Use BASE_FILES instead of redundant STATE_DIR 2018-08-03 16:46:01 -05:00
Erik Johnson
612ffb5fe8
Use new get_diff helper in file module 2018-08-03 16:39:53 -05:00
Erik Johnson
c632265802
Make to_unicode/to_str/to_bytes helpers attempt latin-1 
Also allow for multiple encodings to be passed
 2018-08-03 16:34:54 -05:00
Nicole Thomas
0ee1940232
Merge branch '2018.3' into bp-48863 2018-08-03 17:07:42 -04:00
Erik Johnson
2a0cb49b01
Add get_diff to salt.utils.stringutils 2018-08-03 15:56:58 -05:00
Nicole Thomas
848e26ed0b
Merge pull request #48893 from Ch3LL/http_tests 
handle when ca_certs is None in utils.http
 2018-08-03 16:30:47 -04:00
Nicole Thomas
0272cadff8
Merge branch '2018.3' into unit_state 2018-08-03 16:30:28 -04:00
Ch3LL
3d6455dbcd
remove unecessary comment in setup 2018-08-03 15:34:46 -04:00
Ch3LL
8e30db0217
move destructivetest to testname 2018-08-03 15:32:15 -04:00
Nicole Thomas
f1adf56017
Merge pull request #48903 from Vaelatern/improve-salt-cloud-python3-virt 
Wrap ElementTree.tostring to make strs, not bytes
 2018-08-03 15:12:33 -04:00
Ch3LL
708dec8740
add destructivetest to setup and teardown for runas test 2018-08-03 15:09:10 -04:00
Nicole Thomas
1f093cef4a
Merge branch '2018.3' into merge-2018.3 2018-08-03 15:04:09 -04:00
Ch3LL
c0730ff968
fix test_runas integration test for macosx 2018-08-03 14:57:15 -04:00
Mike Place
16d251f7ff
Merge branch '2018.3' into http_tests 2018-08-03 10:40:40 -06:00
Mike Place
d23471262d
Merge pull request #48900 from Ch3LL/cmd_unit 
skip getpwnam check on mac in unit test_cmdmod
 2018-08-03 10:38:50 -06:00
Daniel Wallace
d622a49b58
Merge pull request #48921 from rallytime/bp-48904 
Back-port #48904 to 2018.3
 2018-08-03 10:17:14 -05:00
William Giokas
b504625f61
No rehashing in parallel 
Rehashing in parallel causes pyenv to fail, if they're run at almost the
exact same time. It's breaking our lint tests pretty horribly.
 2018-08-03 10:54:37 -04:00
Toyam Cox
c45447fe0b Wrap ElementTree.tostring to make strs, not bytes 2018-08-02 22:26:13 -04:00
Ch3LL
b82dd708be
skip getpwnam check on mac in unit test_cmdmod 2018-08-02 16:39:49 -04:00
Ch3LL
5896c7fc36
remove base_top_file file in teardown and add sleep 2018-08-02 16:05:41 -04:00
rallytime
b3a5aa49d7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_shadow.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2018-08-02 15:45:36 -04:00
Abid Mehmood
f40b966d99
decode file contents for python2 as well 2018-08-02 15:43:22 -04:00
Nicole Thomas
e79ccb35b1
Merge pull request #48876 from Vaelatern/make-network-learning-optional 
Make IP_LEARNING optional
 2018-08-02 15:30:23 -04:00
Nicole Thomas
1e150923aa
Merge pull request #48877 from Vaelatern/improve-salt-cloud-libvirt-python3-libvirt 
Wrap ElementTree.tostring to make strs, not bytes
 2018-08-02 15:28:56 -04:00
Nicole Thomas
f8bfab4f9f
Merge pull request #48890 from Ch3LL/cmd_test 
add sleep in test_cmd integration test
 2018-08-02 15:15:07 -04:00
Nicole Thomas
52722f6ded
Merge pull request #48885 from rallytime/flaky-tests-shadow 
Mark shadow module integration test as flaky
 2018-08-02 15:04:34 -04:00