Commit Graph

9578 Commits

Author SHA1 Message Date
Erik Johnson
6db2beb6c0
Replace "pchanges" with "changes" to fix onchanges/prereq requisites
Since "pchanges" was never supported in the state compiler, and
"changes" is what these reqs always used, replacing "pchanges" with
"changes" will allow those requisites to work in test mode.

Conflicts:
  - salt/states/file.py
  - salt/states/linux_acl.py
  - salt/utils/napalm.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_file.py
2019-04-18 10:56:30 -04:00
Ch3LL
e09be8425b
Update test_schema to mirror the new ValidationErrors in 3.0.0 2019-04-17 15:45:05 -04:00
Daniel Wozniak
e522ffe08c
Merge pull request #52570 from DSRCorporation/bugs/revert_51963_2019.2
Simplify IPCClient and prevent corrupt messages (Turn 2) 2019.2
2019-04-17 07:03:01 -07:00
Daniel Wozniak
9faa49cca4
Merge pull request #52490 from dwoz/issue_52134
Fix pillar include regression
2019-04-17 06:54:38 -07:00
Dmitry Kuzmenko
fabbcac8e6
A couple of race conditions fixes and a test update. 2019-04-17 02:00:22 +03:00
Ch3LL
294156743a
Merge branch '2018.3' into '2019.2'
Conflicts:
  - tests/unit/transport/test_ipc.py
2019-04-12 12:31:57 -04:00
Thomas S Hatch
dd7a4baa4f
Merge pull request #52046 from twangboy/use_reg_timezone
Use registry to get timezone
2019-04-12 09:58:55 -06:00
Daniel A. Wozniak
2ed650b91f
Merge remote-tracking branch 'saltstack/2019.2' into issue_52134 2019-04-12 03:52:06 +00:00
Daniel Wozniak
6eb2bce9be
Merge pull request #52334 from waynew/51879-fix-binary-pillar-return-error
51879 fix binary pillar return error
2019-04-11 20:45:16 -07:00
Daniel Wozniak
1b969c39cf
Merge pull request #52146 from twangboy/fix_test_symlink_2019.2
Add missing symlink test
2019-04-11 17:51:15 -07:00
Daniel Wozniak
7a1b8cad9e
Merge pull request #52341 from cbosdo/virt-state-fixes
virt.pool_running: fix pool start
2019-04-11 17:14:51 -07:00
Daniel Wozniak
6040282283
Merge pull request #52427 from garethgreenaway/52350_readd_and_gate_unicode_string_literal_support
[2019.2] Support for old yaml render
2019-04-11 17:06:36 -07:00
Daniel Wozniak
80d7aea13c
Merge pull request #52160 from cbosdo/virt-whitespace-fix
Virt whitespace fix
2019-04-11 17:04:24 -07:00
Daniel Wozniak
b551bbd2e1
Merge pull request #52008 from waynew/51832-re-allow-slash-includes
Allow `/` in pillar includes
2019-04-11 17:02:39 -07:00
Daniel Wozniak
7be04287de
Merge pull request #51913 from garethgreenaway/51818_fix_when_sk_is_empty
[2019.2] Fixes to utils/nacl.py
2019-04-11 16:56:56 -07:00
Daniel Wozniak
89f0bd8820
Merge branch '2019.2' into virt-state-fixes 2019-04-11 16:35:25 -07:00
Daniel Wozniak
ead856ee93
Merge branch '2019.2' into 51879-fix-binary-pillar-return-error 2019-04-11 16:33:20 -07:00
Gareth J. Greenaway
82f010ae29
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support 2019-04-11 15:56:35 -07:00
Daniel Wozniak
fd1f539c52
Merge branch '2019.2' into virt-whitespace-fix 2019-04-11 15:53:48 -07:00
Daniel Wozniak
8e1c882715
Merge branch '2019.2' into fix_test_symlink_2019.2 2019-04-11 15:52:39 -07:00
Daniel Wozniak
55d7488d18
Merge branch '2019.2' into 51818_fix_when_sk_is_empty 2019-04-11 15:41:09 -07:00
Daniel Wozniak
8440ae1b3d
Merge branch '2019.2' into 52116-fix-host-present-fail 2019-04-11 15:38:30 -07:00
Daniel Wozniak
dd002fdad8
Fix linter 2019-04-11 15:38:15 -07:00
Daniel Wozniak
4bb918524b
Merge pull request #52506 from bloomberg/2019_zmq_uri
2019.2: transport.zmq: fix bug introduced by b7df7e75cf
2019-04-11 14:12:50 -07:00
Megan Wilhite
ae81fee398
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support 2019-04-11 16:48:05 -04:00
Matt Phillips
b682ec5a19 transport.zmq: fix bug introduced by b7df7e75cf
this change was introduced to address evidently another bug where
somehow self.opts has no master_uri - but in the process it prioritized
using master_ip over master_uri even when master_uri _is_ there.
providing master_uri as a way of specifiying which msater you would like
to create a channel for is documented used elsewhere in the codebase in
multi-master scenarios (ie, event.send, saltutil.revoke_auth)
2019-04-11 13:58:19 -04:00
Matt Phillips
1e9dd7fd3f transport.zmq: fix bug introduced by b7df7e75cf
this change was introduced to address evidently another bug where
somehow self.opts has no master_uri - but in the process it prioritized
using master_ip over master_uri even when master_uri _is_ there.
providing master_uri as a way of specifiying which msater you would like
to create a channel for is documented used elsewhere in the codebase in
multi-master scenarios (ie, event.send, saltutil.revoke_auth)
2019-04-11 13:56:13 -04:00
Shane Lee
fc8e970221
Merge branch '2018.3' into use_reg_timezone 2019-04-11 10:53:08 -06:00
Daniel A. Wozniak
b0af11f3d3
Run include tests when pillar source changes 2019-04-10 22:41:47 +00:00
Daniel A. Wozniak
f45d29b222
Remove un-needed test 2019-04-10 19:16:14 +00:00
Daniel A. Wozniak
6d80789cf1
Fix ipc unit tests 2019-04-10 17:36:36 +00:00
Wayne Werner
ee3115fa94
Allow leading dots and / as pillar separators 2019-04-09 18:11:44 -05:00
Gareth J. Greenaway
b618d44759
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support 2019-04-08 14:55:37 -07:00
Gareth J. Greenaway
cb01a1b6bb
Merge branch '2019.2' into 51818_fix_when_sk_is_empty 2019-04-08 14:41:47 -07:00
Gareth J. Greenaway
1a1e333583
Merge branch '51818_fix_when_sk_is_empty' of github.com:garethgreenaway/salt into 51818_fix_when_sk_is_empty 2019-04-08 14:40:45 -07:00
Gareth J. Greenaway
dd2306921f
Adding tests for NACL changes. 2019-04-08 14:40:06 -07:00
Shane Lee
a429542e91
Merge branch '2019.2' into fix_test_symlink_2019.2 2019-04-08 13:37:18 -06:00
Daniel A. Wozniak
47203f7f79
Fix ipc unit tests 2019-04-08 17:17:20 +00:00
Cédric Bosdonnat
b297e7db20
virt: handle whitespaces in VM names
The disk creation code is now ready to handle whitespaces in virtual
machine name.
2019-04-08 15:31:13 +02:00
Cédric Bosdonnat
25b968151e
virt.pool_running: fix pool start
Building a libvirt pool starts it. When defining a new pool, we need to
let build start it or we will get libvirt errors.
2019-04-08 14:46:42 +02:00
Cédric Bosdonnat
30981d25b9
Remove unneeded kwargs in virt states
Avoid using kwargs to get the states parameters, perfer documented
named parameters with default value.

(cherry picked from commit c7c5d6ee88)
2019-04-08 14:39:35 +02:00
Cédric Bosdonnat
0871c028c6
virt: allow defining the VM type and arch when creating it
Some hypervisors can handle several CPU architectures or have different
virtualization types. This is reflected in libvirt by the OS type (badly
named, indeed) and the arch value. Allow users to set them when creating
a VM using either virt.init or virt.running.

Signed-off-by: Cédric Bosdonnat <cbosdonnat@suse.com>
(cherry picked from commit 2463ebe5a8)
2019-04-08 14:39:35 +02:00
Cédric Bosdonnat
1c65d25eb4
Updating running domains in virt.running
So far virt.running does nothing if the corresponding domain is already
defined. Use the new virt.update function to change the domain
configuration.

(cherry picked from commit 2a5f6ae5d6)
2019-04-08 14:39:35 +02:00
Cédric Bosdonnat
13d7819c7f
Add missing virt states unit tests
So far only the virt.running state is unit tested. Add tests for the
other states. Deprecated virt states have been purposedly left untested.

(cherry picked from commit fc75872fb6)
2019-04-08 14:39:34 +02:00
Cédric Bosdonnat
0681d865f6
virt.running support for all virt.init options
virt.running actually calls virt.init if the virtual machine doesn't
exist. Let the user define all the virt.init possible options in his
running states too.

(cherry picked from commit cb00a5f9b4)
2019-04-08 14:39:34 +02:00
Cédric Bosdonnat
c6a444ba87
Add test case for virt.running
Test virt.running when the domain needs to be edited and started. This
will prevent regressions when improving virt.running to handle the new
virt.init parameters.

(cherry picked from commit 495db345a5)
2019-04-08 14:39:34 +02:00
Cédric Bosdonnat
2db7a988b2
Let virt running state provide errors
As mentioned in issue 47972, applying the virt.running state doesn't
report any error if the libvirt create call actually failed.

This commit introduces proper handling of the libvirt errors to let
users see the libvirt error in case of failure.

Also add test cases for virt.running to prevent regression.

(cherry picked from commit 451e7da55b)
2019-04-08 14:39:12 +02:00
Gareth J. Greenaway
cce6200fac
Fixing lint
Fixing lint
2019-04-05 13:42:18 -07:00
Gareth J. Greenaway
f848aa474d
Adding support back in with, a gated configuration option, for the old YAML Loader. 2019-04-05 11:31:03 -07:00
Ch3LL
fe13214bd1
Merge branch '2018.3' into '2019.2'
No conflicts.
2019-04-04 09:35:08 -04:00
Daniel Wozniak
b6028b907b
Merge pull request #52403 from bdrung/fix-test-conditions
Fix test conditions
2019-04-03 10:07:53 -07:00
Daniel Wozniak
c7cb00923e
Merge branch '2019.2' into fix_test_symlink_2019.2 2019-04-03 10:06:27 -07:00
Daniel Wozniak
e5a755d45d
Merge pull request #52250 from twangboy/fix_grains
Fix the domain grain on Windows
2019-04-03 09:28:54 -07:00
Benjamin Drung
e74f78fca6 Skip ExtendTestCase if templates directory is missing
The release tarball does not contain the `templates` directory.
Therefore `ExtendTestCase` will fail:

```
======================================================================
ERROR: test_run (unit.utils.test_extend.ExtendTestCase)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/utils/test_extend.py", line 40, in test_run
    out = salt.utils.extend.run('test', 'test', 'this description', integration.CODE_DIR, False)
  File "salt/utils/extend.py", line 242, in run
    MODULE_OPTIONS = _fetch_templates(os.path.join(salt_dir, 'templates'))
  File "salt/utils/extend.py", line 76, in _fetch_templates
    for item in os.listdir(src):
FileNotFoundError: [Errno 2] No such file or directory: ' templates'
```

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2019-04-03 16:33:07 +02:00
Benjamin Drung
0473683ace Skip SampleConfTest if sample conf directories are missing
The release tarball does not contain `conf/cloud.profiles.d`,
`conf/cloud.providers.d`, and `conf/cloud.maps.d`. Therefore the test
cases will fail:

```
======================================================================
ERROR: test_conf_cloud_maps_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 236, in test_conf_cloud_maps_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.maps.d/'

======================================================================
ERROR: test_conf_cloud_profiles_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 200, in test_conf_cloud_profiles_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.profiles.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.profiles.d/'

======================================================================
ERROR: test_conf_cloud_providers_d_files_are_commented (unit.test_config.SampleConfTest)
[CPU:0.0%|MEM:53.9%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/unit/test_config.py", line 218, in test_conf_cloud_providers_d_files_are_commented
    cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.providers.d/')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/cloud.providers.d/'
```

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2019-04-03 16:32:58 +02:00
Justin Findlay
2f49231233
modules.network: update unit test 2019-04-02 20:45:52 -07:00
Wayne Werner
9d1b2a0217
Only return None on host.present changes when test
Previously, when using `test=True`, `host.present` would return
`None` always. In Salt we return `True` when there are (or would be)
changes, `False` when there are no changes, and `None` when there
*would* have been changes.

This brings `host.present` in-line with that convention.
2019-04-02 19:10:36 -05:00
Gareth J. Greenaway
28e76b1fb2
Merge branch '2018.3' into merge-2019.2
Conflicts:
   - tests/unit/grains/test_core.py
2019-04-02 14:05:55 -07:00
Daniel Wozniak
10d041b63e
Merge pull request #52344 from twangboy/os_release_embedded
Fall back to old way of getting osrelease grain if new way fails
2019-03-28 11:06:47 -07:00
Wayne Werner
2aa971d2e5
lint cleanup 2019-03-28 12:41:16 -05:00
Shane Lee
d0987e626c
Merge branch '2018.3' into use_reg_timezone 2019-03-28 10:12:25 -06:00
Shane Lee
3eae05aa9a
Merge branch '2019.2' into fix_test_symlink_2019.2 2019-03-28 10:08:58 -06:00
Shane Lee
a77ec81e6f
Merge branch '2018.3' into fix_grains 2019-03-28 09:59:09 -06:00
Ch3LL
63962b547a
Merge branch '2018.3' into '2019.2'
Conflicts:
  - salt/states/linux_acl.py
  - salt/transport/ipc.py
2019-03-28 11:10:45 -04:00
Gareth J. Greenaway
8461608438
Updating the incron module, state module and tests to remove use of comments. 2019-03-27 16:53:28 -07:00
twangboy
74ab4d3792
Use old way to get osrelease if new way fails 2019-03-27 17:03:13 -06:00
Daniel Wozniak
7040643a82
Merge pull request #52172 from garethgreenaway/51959_fix_acl_present_output
[2018.3] Changes to linux_acl state.
2019-03-27 15:51:52 -07:00
Daniel Wozniak
7b2b5217bf
Merge pull request #51963 from DSRCorporation/bugs/49147_ipc_subscriber
Allow multiple instances of IPCMessageSubscriber in one process
2019-03-27 15:48:55 -07:00
Shane Lee
87bb513d63 Fix failing symlink test (#52145) 2019-03-27 14:58:57 -06:00
Dmitry Kuzmenko
cc46e9c498
Merge branch '2018.3' into bugs/49147_ipc_subscriber 2019-03-27 23:37:31 +03:00
Dmitry Kuzmenko
23733bde5a
Regression test for parallel IPCMessageSubscriber support 2019-03-27 23:33:10 +03:00
Wayne Werner
28c29459c8
keep_pillar not needed 2019-03-26 20:09:22 -05:00
Wayne Werner
f2aebf9cb5
Assume file contents are binary
Try to encode as unicode, but if not, just fall back to binary.
That's probably what the data was in the first place.
2019-03-26 19:41:47 -05:00
Wayne Werner
2b8c782891
Test gpg render with replace newlines 2019-03-26 19:41:40 -05:00
Wayne Werner
c4b385b92a
Allow binary pillar data
There's no real reason that pillars can't/shouldn't be able to
contain binary data. This gives us the ability to say that it's OK.
2019-03-26 19:41:33 -05:00
Wayne Werner
604b671ef9
Return binary data from gpg renderer
If we receive binary data, we should respond with binary data.
2019-03-26 19:41:26 -05:00
Gareth J. Greenaway
4908ed3048
Merge branch '2017.7' into merge-2018.3 2019-03-25 13:28:15 -07:00
Megan Wilhite
34d601e902
Merge branch '2019.2' into merge-2019.2 2019-03-22 16:38:07 -04:00
Pedro Algarvio
cc6fb4662a
Additionally ignore files in nox virtualenvs and CI artifacts directories 2019-03-21 11:32:39 +00:00
twangboy
c874831ef4
Don't set the domain grain to windowsdomain 2019-03-20 08:52:21 -06:00
twangboy
65eb461071
Add a test for windows grains 2019-03-19 15:40:56 -06:00
Ch3LL
c6ba2e605e
Fix lint for test_win_file 2019-03-15 10:55:22 -04:00
Ch3LL
9ada8d9b7f
Merge branch '2018.3' into '2019.2'
Conflicts:
  - salt/transport/zeromq.py
  - tests/unit/modules/test_kubernetesmod.py
  - tests/unit/modules/test_win_file.py
2019-03-14 16:13:54 -04:00
Gareth J. Greenaway
bfdb6691ff
Updating the reverse octal lookup dictionary. Updating tests. 2019-03-14 10:21:42 -07:00
Gareth J. Greenaway
4b99afa819
Fixing the output when there are changes for the ACL state so the permissions are shown and not the octal number. 2019-03-13 17:27:39 -07:00
twangboy
83bed46a60
Add missing symlink test 2019-03-11 15:52:55 -06:00
Gareth J. Greenaway
4a126b3c5b
Merge branch '2019.2' into 52036_rsync_state_no_changes_when_error 2019-03-07 15:38:34 -08:00
Gareth J. Greenaway
0fb859d5c8
Adding a test for the rsync state 2019-03-07 15:35:15 -08:00
twangboy
9a8afa6433
Fix tests, add null byte test 2019-03-07 16:28:31 -07:00
Daniel Wozniak
a7a97544d7
Merge pull request #51896 from twangboy/win_disks
Add all attached drives to the disks grain
2019-03-07 11:35:00 -07:00
Daniel Wozniak
48d298c568
Merge pull request #51918 from twangboy/fix_compat
Fix _compat for py3
2019-03-07 11:33:27 -07:00
Alexander Fischer
fcac9f3e92
Skip Test on Non-Windows systems 2019-03-07 11:33:09 -05:00
Alexander Fischer
f42d17d093
Derive from LoaderModuleMockMixin 2019-03-07 11:31:35 -05:00
Alexander Fischer
5052017ea6
Define __opts__ dict 2019-03-07 11:31:35 -05:00
Alexander Fischer
b7b571e393
Define __opts__ dict 2019-03-07 11:31:35 -05:00
Alexander Fischer
ee3ad08e14
Define __opts__ dict 2019-03-07 11:31:35 -05:00
Alexander Fischer
64d8451dcb
Use default file module 2019-03-07 11:31:34 -05:00
Alexander Fischer
886ef1997e
Fix name of makedirs_ method 2019-03-07 11:31:34 -05:00
Alexander Fischer
4cc5f77b76
Check for path to be a symlink 2019-03-07 11:31:31 -05:00
Megan Wilhite
54ea40a265
Merge branch '2019.2' into merge-2019.2 2019-03-07 10:38:23 -05:00
Shane Lee
057d415d23
Merge branch '2018.3' into win_disks 2019-03-06 12:35:34 -07:00
Gareth J. Greenaway
faa3471c05
Merge branch '2018.3' into 2018.3 2019-03-05 17:42:18 -08:00
twangboy
a791901775
Fix compat, add tests 2019-03-05 18:38:51 -07:00
Daniel Wozniak
2ebfa22f87
Merge pull request #51967 from twangboy/add_compat_tests
Add unit tests for _compat.py
2019-03-05 17:18:34 -07:00
twangboy
0d419e378c
Fix some lint 2019-03-05 17:13:08 -07:00
twangboy
aa61dabab4
Add tests 2019-03-05 17:09:07 -07:00
Ch3LL
a16891347c
Merge branch '2018.3' into '2019.2'
Conflicts:
  - doc/conf.py
  - salt/modules/win_system.py
  - salt/states/boto3_route53.py
2019-03-05 16:00:05 -05:00
Daniel Wozniak
2c4dff609c
Merge pull request #51905 from aplanas/fix_mount
mount: fix extra -t parameter
2019-03-05 12:55:59 -07:00
Daniel Wozniak
4b2c8cceff
Merge pull request #51815 from garethgreenaway/51673_multiple_file_sections_with_excludes
[2018.3] Fix to inotify beacon when multiple file paths with excludes are used
2019-03-05 12:49:38 -07:00
Daniel Wozniak
be28623bf7
Merge pull request #51946 from Ethyling/fix-systemd-version
Fix retrieve systemd version using regex
2019-03-05 12:20:18 -07:00
Shane Lee
e85f0043f6
Merge branch '2018.3' into add_compat_tests 2019-03-05 10:29:43 -07:00
twangboy
ea69062fb3
Fix lint 2019-03-05 10:28:59 -07:00
Jordan Jacobelli
b55770768f Add test for systemd version from git describe
Signed-off-by: Jordan Jacobelli <jordan@cri.epita.fr>
2019-03-05 12:41:31 +01:00
Alberto Planas
ac688df875 mount: fix extra -t parameter
If 'fstype' parameter is not set in Linux environments, salt will
build a mount command with an empty -t value, making the command
fail.
2019-03-05 11:48:09 +01:00
Daniel Wozniak
a879140e21
Merge branch '2019.2' into issue_51816 2019-03-05 03:02:12 -07:00
Daniel Wozniak
6aee2c4502
Merge pull request #51806 from twangboy/fix_beacon
Fix diskusage beacon on Windows
2019-03-05 02:23:10 -07:00
twangboy
eb984f5b32
Add unit tests for _compat.py 2019-03-04 18:08:18 -07:00
twangboy
a38300b156
Use winapi.com instead of coinitialize 2019-03-04 17:59:06 -07:00
Daniel A. Wozniak
0e61cf39e4
Fix linter errors/warnings 2019-03-04 14:48:33 -07:00
Daniel A. Wozniak
8c641c66fb
make LDAP attr defaults string types on py2 2019-03-04 14:36:14 -07:00
Gareth J. Greenaway
58ef51db75
Merge branch '2018.3' into 51673_multiple_file_sections_with_excludes 2019-03-01 11:40:07 -08:00
Daniel Wallace
1f3be1cb90
fix import in test 2019-03-01 13:37:42 -06:00
Daniel Wallace
8572c17091
rename kubernetes module to kubernetesmod
This makes sure this doesn't import the kubernetes module from
salt/modules while the kubernetes python module is not installed
2019-03-01 13:33:50 -06:00
Erik Johnson
1fcb0ff264
Fix edge case when minion ID is a 16-character string
Some code in salt._compat which checks if the value is a packed binary
representation of an IPv6 address fails if the value passed is not a
bytestring (i.e. a `unicode` type on PY2 or `str` type on PY3). This
fixes that code when the minion ID is a 16-character string (not a
bytestring). Note that the minion ID will never be a bytestring as of
2018.3.0, so this affects any 16-character minion ID when the minion ID
is checked to see if it is really an IP address.
2019-03-01 10:52:03 -05:00
Gareth J. Greenaway
63da8be7c9
Fixing a bug that caused excludes to not work as expected when multiple file options were in place, the excludes of the last file section were being used over any previous ones. Including a test to ensure excludes work as expected when multiple file sections are in place. 2019-02-25 17:19:39 -08:00
twangboy
2bf6179743
Fix some lint 2019-02-25 13:15:43 -07:00
twangboy
0f38eea9a0
Add lowercase test 2019-02-25 12:52:17 -07:00
twangboy
7cdc660552
Add some tests 2019-02-25 12:41:26 -07:00
Gareth J. Greenaway
61735787dc
Fixing lint errors 2019-02-23 10:01:01 -08:00
Gareth J. Greenaway
e37fc20e7c
Merge branch '2018.3' into merge-2018.3
Conflicts:
  - doc/ref/modules/all/index.rst
  - salt/states/file.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/modules/test_zypperpkg.py
  - tests/unit/states/test_file.py
2019-02-22 16:38:15 -08:00
twangboy
64f45f8650
Make recurse and directory case sensitive 2019-02-22 11:44:39 -07:00
twangboy
feb29f3353
Make recurse and directory case sensitive 2019-02-21 18:59:09 -07:00
Gareth J. Greenaway
d681064607
Merge branch '2018.3' into nftables_cleanup 2019-02-20 12:03:58 -08:00
Gareth J. Greenaway
e37458ee35
Fixing a couple tests. 2019-02-20 09:52:54 -08:00
Ch3LL
4171271930
Fix pylint, remove unused import 2019-02-20 10:20:24 -05:00
Ch3LL
3f146197a1
Remove skipif and change expected return for solarisips test 2019-02-20 10:14:04 -05:00
Daniel Wallace
61b43905c2
fix modulenames from virtualnames tests 2019-02-20 08:06:29 -06:00
Daniel A. Wozniak
3263d31592
Merge remote-tracking branch 'saltstack/2018.3' into solarisipstests 2019-02-20 01:17:36 -07:00
Gareth J. Greenaway
dc4afbb8b4
More updates to nftables module, state modules, and unit tests. 2019-02-19 17:42:19 -08:00
Daniel A. Wozniak
9caafeca61
Skip solarisips when not on solaris 2019-02-19 16:59:10 -07:00
Daniel A. Wozniak
043efa08fa
Skip solarisips when not on solaris 2019-02-19 16:58:10 -07:00
Daniel Wallace
d59952fce6
Merge branch '2018.3' into virtualnames 2019-02-19 16:59:42 -06:00
Daniel Wallace
33bb5bfe69
fix use of virtualname
Make sure that the virtualname is included in the actual filename of
core modules.  This will help speed up loading of modules that need to
use the virtualname, so that we hit @depends decorators less.
2019-02-19 13:16:06 -06:00
Gareth J. Greenaway
3ec96e36e2
initial work to cleanup the nftables module, state module, and the unit tests. 2019-02-19 10:44:01 -08:00
Megan Wilhite
b46eac3ec0
Merge branch '2019.2' into merge-2019.2 2019-02-19 11:02:29 -05:00
Daniel Wozniak
0bd2d6eadb
Merge pull request #51561 from isbm/isbm-saltssh-thintar-delay-fix
SaltSSH: fix delay when creating thin TAR
2019-02-19 03:15:46 -07:00
Ch3LL
64322db582
Fix is_windows utils call 2019-02-15 15:18:24 -05:00
Ch3LL
92bd6b9dc3
Fix salt.utils.is_windows call 2019-02-15 15:16:38 -05:00
Ch3LL
ffa2f5fa50
Merge branch '2018.3' into '2019.2'
Conflicts:
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - pkg/windows/req_win.txt
  - salt/grains/core.py
2019-02-15 15:09:36 -05:00
Bo Maryniuk
f79c81a9e1 Update UT mocking, adjusting for temporary file 2019-02-14 15:50:21 +01:00