valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,599 Commits 24 Branches 182 Tags 341 MiB
f077783cbd
Commit Graph

8411 Commits

Author SHA1 Message Date
Daniel A Wozniak
c858bf477f
Remove which mock to get the test passing 
This test passes in my local kitchen tests when the which mock is
removed. However, I added this mock to try and get the test passing in
jenkins. The original failure that caused me to add it was removed from
jenkins. This will either fix the test or reveal the other error that
needs to be fixed.
 2018-07-12 11:14:47 -07:00
rallytime
8bc71688ea
Remove /sr.* pattern from test 
/sr.* pattern should raise exception
 2018-07-12 11:24:44 -04:00
rallytime
5e2e2a63fa
Update file unit tests to handle "writelines" change 
Since file.line is now using "writelines()" instead of "write()", we
need to handle the unittests accordingly.
 2018-07-12 11:12:22 -04:00
rallytime
d0b6e82ecb
Add 'name' as the passed in filepath for test_line_insert_ensure_before_first_line test 
With 'foo', the test fails with an unknown file KeyError - we need to use the "name"
variable instead.

Fixes the test_line_insert_ensure_before_first_line test.
 2018-07-12 11:11:47 -04:00
rallytime
d8920cb61f
Update test_line_insert_ensure_before_first_line to use new mock_open methodologies 2018-07-12 11:11:32 -04:00
Jerzy Drozdz
adfa3aed0d
Empty match on delete or replace not causing IndexError exception 2018-07-10 09:20:23 -04:00
Jerzy Drozdz
d2af81e9c7
Make integration green. Added test for mode ensure insert before first line 2018-07-10 09:19:55 -04:00
Jerzy Drozdz
3af551ebe1
/sr.* pattern should raise exception 2018-07-10 09:17:49 -04:00
Jerzy Drozdz
935a9b9d56
test_line_insert_end fixed 2018-07-10 09:14:18 -04:00
rallytime
54341d1a8d
Update old utils paths to use new utils paths 2018-07-09 10:34:38 -04:00
rallytime
68aabff0cf
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
  - salt/netapi/rest_tornado/saltnado.py
  - salt/utils/versions.py
  - tests/integration/states/test_file.py
 2018-07-09 10:27:58 -04:00
Nicole Thomas
2baa7f189f
Merge pull request #48431 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-07-05 13:22:59 -04:00
slivik
70144bccbb
Fixes dry run in ini_manage + Fixes related bug - when working with options which are not in section. + Fixes related tests + Fixes pylint warnings 2018-07-04 09:19:36 +02:00
Nicole Thomas
a7e52f0de2
Merge pull request #48429 from rallytime/bp-46824 
Back-port #46824 to 2017.7
 2018-07-03 17:45:36 -04:00
Daniel A. Wozniak
349a2b279e
Prepend test needs file.touch method 2018-07-03 13:32:02 -07:00
rallytime
3e59dda0b1
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-07-03 16:09:28 -04:00
Beorn Facchini
8b4486248d
Added ignore_retcode to mock unit tests 2018-07-03 16:05:04 -04:00
Nicole Thomas
83e387c951
Merge pull request #48410 from dwoz/service_dead_test_fix 
Fix service dead test on windows
 2018-07-03 10:17:28 -04:00
Daniel A. Wozniak
5c0923448d
Fix service dead test on windows 2018-07-02 12:03:03 -07:00
Daniel A. Wozniak
9c7085b70f
Fix file state prepend test 2018-07-02 11:30:55 -07:00
Daniel Wozniak
10e93bff7f
Merge pull request #48396 from dwoz/symlink_test_fix 
Fix file.symlink state test for windows
 2018-07-02 11:10:31 -07:00
Nicole Thomas
5b38019ca0
Merge pull request #48339 from terminalmage/backport-tojson-filter 
Backport tojson filter from #48309 to 2018.3
 2018-07-02 13:52:52 -04:00
Nicole Thomas
d3c658bdcf
Merge pull request #48358 from Ch3LL/m2crypto_fix 
Fix corrupt public key with m2crypto python3
 2018-07-02 09:10:31 -04:00
Daniel A. Wozniak
d3456d31e6
Fix file.symlink state test for windows 2018-06-30 15:44:58 -07:00
rallytime
c4fd2a0930
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/rabbitmq.py
  - tests/integration/modules/test_pip.py
 2018-06-30 09:33:21 -04:00
Ch3LL
8fdd34d430
m2crypto open file in rb mode for pub key 2018-06-29 14:43:06 -04:00
twangboy
77629f640a
Fix module unit tests 2018-06-29 11:15:23 -06:00
Ch3LL
a964db4663
Fix corrupt public key with m2crypto python3 2018-06-28 11:31:21 -04:00
twangboy
707906ac15
Fix unit.state.test_powercfg 
Add test for test=True
 2018-06-27 16:06:58 -06:00
twangboy
32c5014eb6
Fix unit tests 2018-06-27 16:06:57 -06:00
Erik Johnson
c636b18cf0
Add unit test for tojson filter 2018-06-27 12:23:29 -05:00
Ch3LL
5d6135e1e2
Fix macosx grains when swapusage returns comma 2018-06-25 18:03:57 -04:00
rallytime
c7bb8a50b0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/x509.py
  - salt/runners/cloud.py
  - tests/unit/modules/test_state.py
 2018-06-25 10:41:06 -04:00
Nicole Thomas
27a0e95174
Merge pull request #48279 from terminalmage/mock_open-docs 
Add documentation/further enhancements to rewritten mock_open
 2018-06-25 09:12:29 -04:00
Erik Johnson
830a624ce8
Ignore IOError when tearing down filehandles not opened for reading 2018-06-23 21:28:34 -05:00
Erik Johnson
a13d1fe1a0
Update mock_open usage to reflect read_data type enforcement 2018-06-23 15:04:47 -05:00
Erik Johnson
374a8ce31f
Add more mock_open tests 2018-06-23 15:04:24 -05:00
Erik Johnson
0f06adb008
Improve code-reuse in mock_open tests 2018-06-23 15:04:06 -05:00
Nicole Thomas
09b036c26e
Merge pull request #48228 from garethgreenaway/48204_mysql_user_password_exception 
[2018.3] Fixes to mysql module
 2018-06-22 11:43:59 -04:00
Nicole Thomas
731ec0a11a
Merge pull request #48037 from terminalmage/fix-custom-types-sync-docs 
Add "sync_mods" argument to state.apply/state.sls
 2018-06-21 15:57:02 -04:00
rallytime
84ec655c24
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/minion.py
  - salt/modules/dockermod.py
  - salt/modules/lxc.py
  - salt/utils/__init__.py
  - tests/unit/modules/test_mount.py
 2018-06-21 14:22:15 -04:00
Nicole Thomas
51928ff050
Merge pull request #48166 from terminalmage/salt-jenkins-1000 
Add trace logging and optimize file handling in grains.core.os_data
 2018-06-21 14:02:32 -04:00
Erik Johnson
8b1bd0eda2
Update test to reflect changed argument name 2018-06-21 11:39:12 -05:00
Gareth J. Greenaway
1b2ffcef1d
Updating the mysql module to not use the PASSWORD when MySQL is version 8.0.11 or higher, where the PASSWORD function has been removed. 2018-06-20 11:41:14 -07:00
Nicole Thomas
6072d1ef9c
Merge pull request #48216 from Ch3LL/grains_unicode 
Fix UnicodeDecodeError when reading file to determine virtual grain
 2018-06-20 12:53:40 -04:00
Nicole Thomas
de614d31f5
Merge pull request #48209 from rallytime/bp-47986 
Back-port #47986 to 2018.3
 2018-06-20 09:44:16 -04:00
Ch3LL
c4334f3f14
Fix UnicodeDecodeError when reading file to determine virtual grain 2018-06-19 16:38:28 -04:00
rallytime
dae65da256
Merge branch '2018.3.1' into '2018.3' 2018-06-19 14:56:06 -04:00
J. Eduardo
f4b3bd5d2c
Changed salt.utils.fopen to salt.utils.files.fopen 2018-06-19 14:30:54 -04:00
J. Eduardo
8686872909
Fixed typos, removed repeated unit tests, and applied code fixes suggested by linter. 2018-06-19 14:30:48 -04:00
J. Eduardo
5aa99d14c4
Added unit tests for CRL creation and certificate revocation with CRL 2018-06-19 14:30:38 -04:00
Nicole Thomas
71e385501b
Merge pull request #48165 from terminalmage/issue48144 
Fix regression with top_file_merging_strategy=same
 2018-06-19 14:03:06 -04:00
Erik Johnson
b73df0ab00
Change call_args to call.args to reflect changes to MockFH 2018-06-18 16:57:51 -05:00
Erik Johnson
0c2cc07704
remove unused import 2018-06-18 16:55:19 -05:00
Nicole Thomas
e079fce38d
Merge pull request #48190 from terminalmage/fix-vfstab-test 
Fix mount.vfstab unit test
 2018-06-18 17:47:54 -04:00
Erik Johnson
b8c0a55cf3
Add test for tell() 2018-06-18 16:24:44 -05:00
Erik Johnson
efb8f49d42
Add tests for read_data being a list, and containing unicode or bytestrings 2018-06-18 14:48:53 -05:00
Erik Johnson
71eeae1240
Update mount module unit tests to reflect changes in mock_open 2018-06-18 13:39:52 -05:00
Erik Johnson
8d70d14362
Fix mount.vfstab unit test 
This test was calling mount.fstab() instead of mount.vfstab()
 2018-06-18 13:21:40 -05:00
Erik Johnson
16c414e120
Update nfs3 module tests to reflect changes in mock_open 2018-06-18 12:28:38 -05:00
Erik Johnson
b7eab25d6c
Update grub_legacy module tests to reflect changes in mock_open 2018-06-18 12:21:33 -05:00
Erik Johnson
cc002b8fd7
Update new network unit test to reflect changes in mock_open 2018-06-18 12:13:49 -05:00
Erik Johnson
a8f11594f1
Update new core grains tests to reflect changes in mock_open 2018-06-18 11:53:59 -05:00
Erik Johnson
84ce18d956
Update crypt unit tests to reflect changes in mock_open 2018-06-18 10:38:53 -05:00
Erik Johnson
67c036dc2d
Add MockCall to tests.support.mock to track calls 2018-06-18 10:34:33 -05:00
Erik Johnson
2556a1e13d
Remove unused import 2018-06-18 07:23:52 -05:00
Erik Johnson
6acb4c83ec
Update newly added test to reflect renaming of handles attribute 2018-06-18 00:22:43 -05:00
Erik Johnson
77e5288d42
Update fibre_channel grains tests to reflect changes in mock_open 2018-06-18 00:21:26 -05:00
Erik Johnson
ed40371a06
Update timezone module tests to reflect changes in mock_open 2018-06-18 00:21:26 -05:00
Erik Johnson
2598d2453a
Update snapper module tests to reflect changes in mock_open 2018-06-18 00:21:26 -05:00
Erik Johnson
55487c175c
Fix mock_open call to use new multifile syntax 2018-06-18 00:21:26 -05:00
Erik Johnson
7f516ef73a
Update puppet module tests to reflect changes in mock_open 2018-06-18 00:21:26 -05:00
Erik Johnson
33a97c4ecc
Update btmp beacon tests to reflect changes in mock_open 2018-06-18 00:21:26 -05:00
Erik Johnson
bc027cfa94
Update wtmp beacon tests to reflect changes in mock_open 2018-06-18 00:21:26 -05:00
Erik Johnson
7eb4b1ae1c
Update cp.push test to reflect changes to mock_open 2018-06-18 00:21:25 -05:00
Erik Johnson
4b5a393445
Update junos tests to reflect changes to mock_open 2018-06-18 00:21:25 -05:00
Erik Johnson
278a222b09
Update dnsutil tests to reflect changes to mock_open 2018-06-18 00:21:25 -05:00
Erik Johnson
4e67955572
Replace the rest of mock_open with a class 2018-06-18 00:21:25 -05:00
Erik Johnson
75307a47c5
Update linux_sysctl tests to reflect changes to mock_open 2018-06-18 00:21:25 -05:00
Erik Johnson
05c68fd5d9
Use explicit config file and fix remaining mac_sysctl tests 
This updates test_persist_success to work with the new mocked filehandle
support. Additionally, it fixes incorrect invocation of
`mac_sysctl.persist()`; the `config` argument is supposed to be a file
path, not a string config text.
 2018-06-18 00:21:25 -05:00
Erik Johnson
675f03c58f
Update mac_sysctl tests to reflect new mock_open behavior 2018-06-18 00:21:24 -05:00
Erik Johnson
3d2c41d395
Update file module tests to reflect new mock_open behavior 2018-06-18 00:21:24 -05:00
Erik Johnson
f6b46bc608
Remove unused import 2018-06-18 00:16:02 -05:00
Erik Johnson
48d7cfa6d3
Add multifile tests for mock_open 2018-06-18 00:16:02 -05:00
Erik Johnson
cb2620ad2b
Update core grains tests to reflect EAFP changes 2018-06-18 00:16:02 -05:00
Erik Johnson
6a0828beed
Add unit tests for mock_open 2018-06-18 00:16:02 -05:00
Erik Johnson
9af09e0127
Mock config.get due to changes in _refresh_mine_cache 2018-06-18 00:05:25 -05:00
Erik Johnson
d403ae58d7
Add unit test for docker.update_mine 2018-06-17 21:42:28 -05:00
Nicole Thomas
85ebcbd3f2
Merge pull request #48156 from garethgreenaway/48113_ensure_writing_strings_with_file_dot_line 
[2018.3] Unicode fixes for file.line
 2018-06-17 15:34:07 -04:00
Erik Johnson
92ac2a2d6a
Remove unused imports 2018-06-15 17:45:56 -05:00
Erik Johnson
15a44d5dd4
Remove redundant top file merging tests 
These were intrinsically flawed since they only tested the merge
functions themselves, and not the rest of the state compiler. They have
been replaced by the tests in unit.modules.test_state.TopFileMergingCase.
 2018-06-15 17:42:38 -05:00
Erik Johnson
12100d9bd3
Add more top file merging tests 2018-06-15 17:40:44 -05:00
rallytime
398cc78224
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - doc/topics/releases/2017.7.6.rst
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_timezone.py
 2018-06-15 16:51:45 -04:00
Nicole Thomas
9aa9a83b10
Merge pull request #48155 from max-arnold/2018.3 
Do not fail on empty saltclass classes (fix for #48145)
 2018-06-15 16:21:27 -04:00
Erik Johnson
0ed686cb3f
Add unit test for show_top with "same" merging strategy 2018-06-15 14:11:15 -05:00
Gareth J. Greenaway
5a9ef0d1ae
Unless we're using py2 and Windows, ensure we're writing out a string when using file.line. 2018-06-15 11:38:31 -07:00
Nicole Thomas
df2a156338
Merge pull request #48061 from garethgreenaway/port_47049_2017_7 
[2017.7] Porting #47049 to 2017.7.
 2018-06-15 13:15:49 -04:00
Nicole Thomas
152c09cc0c
Merge pull request #48104 from twangboy/fix_test_win_status 
Fix `unit.modules.test_win_status`
 2018-06-15 13:05:33 -04:00
Max Arnold
3d4fcbe3aa Add test for issue #48145 2018-06-15 23:48:14 +07:00
Nicole Thomas
c05c176782
Merge pull request #48081 from terminalmage/issue48012 
Fix UnicodeDecodeError when parsing hosts file with non-ascii
 2018-06-15 08:41:12 -04:00
Erik Johnson
8d2fb0bf25
Fix cp.push test 
mock_open now properly handles bytestrings, so the expected data needed
to be updated.
 2018-06-14 15:23:54 -05:00
Erik Johnson
e230a7223f
Fix definition of test data for wtmp/btmp beacon tests 
There is no need to do things differently on PY2 and PY3
 2018-06-14 15:23:40 -05:00
Mike Place
4b6f1c7f75
Merge pull request #48077 from twangboy/fix_parsers 
Fix issue with `salt.utils.parsers` on Windows
 2018-06-14 18:22:56 +02:00
Erik Johnson
54f9a2ab54
Remove unused import 2018-06-13 21:11:14 -05:00
Erik Johnson
767cc7e87f
fix tabs 2018-06-13 21:10:30 -05:00
Erik Johnson
db19636f56
Get rid of additional newline append 
This looks like it was just incorrectly done before. writelines()
expects you to take care of newlines yourself, so each element should
end in a newline. But we were doing two separate writes, one with the
key=value pair and one with a newline
 2018-06-13 15:17:56 -05:00
Erik Johnson
7427e192ba
Fix more crappy mocking 2018-06-13 15:01:12 -05:00
Erik Johnson
4eaa5789ce
Fix crappy mocking 
This mocking was poorly done, which was revealed when I made an EAFP
modification to _generate_minion_id().
 2018-06-13 14:11:44 -05:00
twangboy
1ec3f436ee
Fix test_error_logged_if_process_get_owner_fails 2018-06-13 12:46:20 -06:00
twangboy
d26fc56f13
Use os.sep for paths 2018-06-13 12:04:37 -06:00
Gareth J. Greenaway
7c472fed51
Fixing failing test_set_hwclock_aix test. 2018-06-13 10:15:28 -07:00
Gareth J. Greenaway
ccb0acc958
Porting #47049 to 2017.7. 2018-06-13 10:15:28 -07:00
Erik Johnson
6fe711ad76
Reverse monkeypatching after test_symlink_list finishes 
On Windows, in test_symlink_list we monkeypatch the file_roots. However,
we don't ever reverse that monkeypatching.

This would not have affected other test classes, because the opts we are
monkeypatching are ones created specifically for that test class. And
due to the lexicographic order in which the tests are run,
test_symlink_list is run last. However, if we were to ever add a test to
that test class which would run after test_symlink_list, it would be
affected by the monkeypatching.
 2018-06-13 09:58:29 -05:00
Erik Johnson
248467edac
Add regression test for _generate_minion_id() 2018-06-13 01:13:43 -05:00
twangboy
0e99dd741c
Fix logic for non-root 2018-06-12 17:45:19 -06:00
twangboy
2d2534a688
Fix parsers for Windows, fix tests 2018-06-12 17:26:40 -06:00
rallytime
3d2ea16c3a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/base.txt
  - salt/states/archive.py
  - salt/states/file.py
  - tests/integration/runners/test_state.py
  - tests/unit/daemons/test_masterapi.py
 2018-06-11 11:45:37 -04:00
Erik Johnson
cb8e6f9fb8
Remove redundant mocking 
This mocking was added to setup_loader_modules and is no longer needed
in individual tests.
 2018-06-08 12:26:31 -05:00
Erik Johnson
bc3ad795e9
Add test for sync argument to state.sls 2018-06-08 12:22:50 -05:00
Daniel Wozniak
1ce7d6c38a
Merge pull request #47989 from dwoz/awscloud 
Properly decode password from aws using m2crypto
 2018-06-06 13:44:28 -07:00
Daniel Wallace
8d15b93d00
remove tox virtualenvs from doc tests 2018-06-06 12:22:22 -05:00
Nicole Thomas
605463ca0d
Merge pull request #47998 from rallytime/bp-47989 
Back-port #47989 to 2018.3.1
 2018-06-06 13:08:03 -04:00
Daniel A. Wozniak
23ab2727be
Fix linter errors 2018-06-06 09:43:04 -07:00
Nicole Thomas
9d56af3cad
Merge pull request #47982 from twangboy/fix_test_win_dns_client 
Fix `unit.modules.test_win_dns_client` tests
 2018-06-06 11:02:10 -04:00
rallytime
1b7e9ac2d3
Lint fixes 2018-06-06 09:44:10 -04:00
Daniel A. Wozniak
0545152ddd
Properly decode password from aws using m2crypto 
Fixes issue #47955
 2018-06-06 09:44:05 -04:00
Daniel A. Wozniak
6c8daa2b85
Properly decode password from aws using m2crypto 
Fixes issue #47955
 2018-06-05 22:27:36 -07:00
twangboy
4ce551811f
Remove the unnecessary to_unicode stuff 2018-06-05 17:49:22 -06:00
Daniel Wallace
556a2067fc
fix masterapi test to use testing directory for configs 2018-06-05 18:36:27 -05:00
twangboy
863ded39fa
Mock reg.cast_vdata 2018-06-05 15:38:28 -06:00
twangboy
2dcdf6788c
Force string to ModuleType 2018-06-05 15:27:12 -06:00
Gareth J. Greenaway
329b2e5956
Ensuring that when a passphrase is passed in, it is returned as a string from the passphrase callback. 2018-06-05 09:29:03 -04:00
Gareth J. Greenaway
e22df8473d
Ensuring that when a passphrase is passed in, it is returned as a string from the passphrase callback. 2018-06-04 16:00:54 -07:00
Nicole Thomas
a46e42ab11
Merge pull request #47927 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-04 14:55:11 -04:00
L4rS6
6d7ef27557
Merge branch '2018.3' into fix-broken-rabbitmq-list-policies 2018-06-04 10:59:30 +02:00
Lars Wagner
e043ea2833 refactored list_policies code and added more tests 2018-06-04 10:56:12 +02:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
Erik Johnson
8cb33d3dec
Quiet the linter 
We need this import to determine whether we have the needed modules to
run the test, even though it is not invoked directly.
 2018-05-31 15:28:25 -05:00
Erik Johnson
91cd57d1e0
Update mocking to reflect changes in service module 2018-05-31 15:28:25 -05:00
Erik Johnson
b9ace5a859
Fix crappy mocking 
This fixes some poorly-conceived mocking that was done because of some
equally dumb imports being done in salt/modules/junos.py (which I fixed
a few commits ago while in the process of cleaning up the docs).
 2018-05-31 15:28:25 -05:00
Erik Johnson
bc9e3acef3
Lint fixes 2018-05-31 15:28:25 -05:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Nicole Thomas
0d229c6182
Merge branch '2018.3' into fix_47559 2018-05-31 11:28:30 -04:00
Nicole Thomas
b4bac9b41b
Merge pull request #47868 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-30 17:20:37 -04:00
rallytime
e5d386e91c
Update solaris core grains test 
The check for zpool grains was moved out of core grains and into
zfs grains. The mock for the call to zpool grains function was failing.

We also need to update any calls to the salt.utils file to use the new
paths.
 2018-05-30 13:50:22 -04:00
rallytime
267f09c1a0
Lint: Remove unused import 2018-05-29 13:56:15 -04:00
rallytime
120ee16b70
Replace old utils paths with new utils paths 2018-05-29 11:19:34 -04:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/win_snmp.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_pkg.py
  - tests/support/helpers.py
  - tests/support/runtests.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/whitelist.txt
 2018-05-29 11:14:39 -04:00
Travis Paul
d50c0ab96b
Lint test_pkgin.py 2018-05-29 10:10:43 -04:00
Travis Paul
4dac0b4a31
pkgin latest_version bugfix 
Handle case where the currently installed package is the latest
 2018-05-29 10:10:43 -04:00
Travis Paul
4ae0313797
Bugfixes and unit tests for pkgin module 
Corrects pkg.lastest_version and pkg.file_dict behavior
 2018-05-29 10:10:43 -04:00
Nicole Thomas
30b31c5db5
Merge pull request #47800 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-25 21:17:40 -04:00
Nicole Thomas
799fce979d
Merge pull request #47552 from twangboy/fix_46981 
Show GPO settings, raise error if trying to set gpo managed settings
 2018-05-25 16:41:21 -04:00
Nicole Thomas
da9eaa1825
Merge pull request #47581 from twangboy/fix_47274 
Add get_encoding salt util
 2018-05-25 16:40:06 -04:00
Nicole Thomas
b860d95b2c
Merge pull request #47726 from gtmanfred/2018.3 
rename boto to botomod
 2018-05-25 16:37:36 -04:00
twangboy
60499d18f0
Skip test if pytz not present 2018-05-25 11:53:37 -06:00
Nicole Thomas
6889befc6b
Merge branch '2017.7' into solaris_product_grains 2018-05-25 09:57:40 -04:00
Nicole Thomas
cffc9b7806
Merge branch '2017.7' into fix_46981 2018-05-24 12:52:59 -04:00
Nicole Thomas
ff6600f25e
Merge branch '2018.3' into fix_47274 2018-05-24 12:47:29 -04:00
Nicole Thomas
0ca5224cbf
Merge branch '2017.7' into winuser 2018-05-24 12:08:35 -04:00
Daniel A. Wozniak
e5948902af
Use salt utils method for this_user 2018-05-24 00:40:20 -07:00
twangboy
9923176b68
Use __utils__, fix unit tests 2018-05-23 17:27:58 -06:00
Daniel A. Wozniak
a056a293f1
Centeralize test username lookup 2018-05-23 16:16:35 -07:00
twangboy
6eff2f847b
Add suggested changes 2018-05-23 13:34:33 -06:00
rallytime
4abfd26e86
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
  - salt/fileclient.py
  - salt/output/__init__.py
  - salt/serializers/configparser.py
  - salt/states/pkg.py
  - salt/states/zpool.py
  - salt/transport/tcp.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_mac_user.py
  - tests/integration/modules/test_pip.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/modules/test_service.py
  - tests/integration/states/test_pip_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_cmdmod.py
 2018-05-23 12:33:00 -04:00
Nicole Thomas
1efe891c42
Merge pull request #47776 from garethgreenaway/970_two_minion_unit_tests_failing 
[2018.3] Fixes to failing _before_connect tests
 2018-05-23 11:10:34 -04:00
Gareth J. Greenaway
ae881547d2
Fixing unit.test_minion.MinionTestCase.test_beacons_before_connect and unit.test_minion.MinionTestCase.test_scheduler_before_connect. 2018-05-23 11:02:38 -04:00
Nicole Thomas
4a6ca67883
Merge pull request #47783 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.1 to 2018.3
 2018-05-23 10:51:55 -04:00
Gareth J. Greenaway
a5011b49ab
Merge branch '2018.3' into 970_two_minion_unit_tests_failing 2018-05-22 14:41:10 -07:00
rallytime
1adb8ea27f
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-22 17:14:31 -04:00
Gareth J. Greenaway
ef24f72169
Fixing unit.test_minion.MinionTestCase.test_beacons_before_connect and unit.test_minion.MinionTestCase.test_scheduler_before_connect. 2018-05-22 12:12:49 -07:00
Daniel Wallace
43997a466e
fix tests 2018-05-22 12:49:47 -05:00
Daniel Wallace
7e30f459c9
rename boto to botomod 2018-05-22 12:49:47 -05:00
Nicole Thomas
60ec3230db
Merge branch '2018.3' into 2018.3-remove-trailing-commas-on-linux-user-gecos-fields 2018-05-22 11:35:20 -04:00
rallytime
17596f3025
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-22 11:26:44 -04:00
Daniel Wallace
3cfb95c7bc
skip test that breaks test suite 2018-05-22 09:34:53 -04:00
Daniel Wallace
3fdfc0fa82
skip test that breaks test suite 2018-05-21 17:42:35 -05:00
Nicole Thomas
3614d3d83a
Merge pull request #47727 from Ch3LL/spelling 
Fix salt.utils.versions.warn_until spelling
 2018-05-21 09:40:59 -04:00
twangboy
e27e9fd1e7
Fix tests on Py3 2018-05-18 16:17:41 -06:00
Ch3LL
ee90c779a8
mac_utils test: patch __salt__['cmd.run*'] 2018-05-18 16:48:48 -04:00
Ch3LL
47a8de5b73
Fix salt.utils.versions.warn_until spelling 2018-05-18 11:59:45 -04:00
Erik Johnson
6192391b7b
Add additional missing modules to whitelist 2018-05-18 08:50:53 -05:00
Erik Johnson
91f9fd38fd
Fix loader whitelists in unit tests 
This resolves failed lazydict lookups in the tests due to improperly-set
whitelists.
 2018-05-17 16:43:36 -05:00
twangboy
771392e299
Fix unit tests, add newline='' to io.open 2018-05-17 13:25:35 -06:00
lomeroe
49053bc106 lint fix 2018-05-17 13:56:24 -05:00
lomeroe
6f185c9179 another lint fix 2018-05-17 12:20:49 -05:00
lomeroe
dbffba6876 fix tons of errors in my tests 2018-05-17 10:50:50 -05:00
lomeroe
8c9355d34c Lint fix 2018-05-17 08:34:19 -05:00
lomeroe
b29ec75da7 Update regexes in core grains for detecting the 'product' grain on 
Solaris Sparc systems.  Additionally, copy the 'product' grain to
'productname' to be consistent with other OSes.
 2018-05-16 16:34:07 -05:00
twangboy
008af0ac6b
Fix unit tests 2018-05-16 15:13:41 -06:00
Erik Johnson
d0243e8f23
Suppress spurious lint failure 
This is failing because elsewhere in the test module the get_top()
member function returns None, but this is done in a highstate attribute
which is cleaned up in the tearDown and established as a fresh
salt.state.HighState instance in the setUp.
 2018-05-16 15:13:54 -05:00
Erik Johnson
3b449f11fc
Add regression test for excludes issue 2018-05-16 12:26:46 -05:00
Erik Johnson
d729656703
Add unit tests for table outputter 2018-05-16 00:02:14 -05:00
andrei
454291ad62
Fix errors when attempting to cache files with long names or URLs 2018-05-15 22:39:09 -05:00
Nicole Thomas
ff861d9089
Merge branch '2018.3' into 2018.3-remove-trailing-commas-on-linux-user-gecos-fields 2018-05-15 11:37:58 -04:00
Pablo Suárez Hernández
7dea455c12
Add unit test for new method 'user.chother' 2018-05-14 10:54:33 +01:00
Pablo Suárez Hernández
d5c9ca0fbc
Add unit tests for GECOS fields 2018-05-14 10:54:33 +01:00
Erik Johnson
d612bd27e4
Move/merge more test modules 
This moves mislocated tests to their proper locations to match the files
they test, merging tests into existing modules where necessary.
 2018-05-10 14:53:52 -05:00
Nicole Thomas
9836a7e62b
Merge pull request #47564 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-10 15:13:35 -04:00
Nicole Thomas
e3ee7053fb
Merge pull request #47563 from rallytime/bp-47224 
Back-port #47224 to 2018.3
 2018-05-10 12:18:06 -04:00
Ch3LL
0763f96458
update salt.utils.platform path for virt core test 2018-05-09 18:02:17 -04:00
Ch3LL
14896f9743
change codeauthor and class name 2018-05-09 17:48:59 -04:00
Ch3LL
502c5bdff5
Ensure mac_service.disabled is correctly querying services 2018-05-09 17:12:50 -04:00
Ch3LL
718252c1ef
Update salt.utils.path mock in virtual core test 2018-05-09 13:24:39 -04:00
rallytime
25f03ae425
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_status.py
  - tests/integration/states/test_pip_state.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-05-09 11:24:02 -04:00
Jorge Schrauwen
1d191445a7
FIX #38671 - zpool.get should support older zfs version 2018-05-09 11:10:24 -04:00
Nicole Thomas
fe4e79f1de
Merge pull request #47518 from Ch3LL/zfs_support 
Fix 47364: ensure we are not caching zfs.is_supported
 2018-05-09 09:29:06 -04:00
Nicole Thomas
332e9f13a6
Merge pull request #47159 from terminalmage/whitelist_blacklist-iter-fix 
Fix for whitelist/blacklist checking for non-list iterables
 2018-05-08 16:43:50 -04:00
Nicole Thomas
21809ddc02
Merge pull request #47514 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-08 14:36:53 -04:00
Ch3LL
d19fef963e
remove unnecessary patch in zfs.is_supported test 2018-05-08 12:14:37 -04:00
Erik Johnson
ca936de372
Treat empty whitelist/blacklist as no whitelist/blacklist 2018-05-08 10:24:21 -05:00
rallytime
e2616b605f
Update the pip tests to use the parsing syntax generated in PR #47196 2018-05-08 10:42:14 -04:00
Erik Johnson
bcccaf2621
Raise a TypeError when invalid input passed to check_whitelist_blacklist 2018-05-08 09:30:23 -05:00
Erik Johnson
2ae510ff2b
Fix comment in test 2018-05-08 09:30:23 -05:00
Erik Johnson
17398efcf7
Fix for whitelist/blacklist checking for non-list iterables 
A recent PY3-compatibility fix was made to `check_whitelist_blacklist`.
The function was previously checking for the `__iter__` attribute to
check if the blacklist and/or whitelist was a sequence of expressions
or a single expression. However, the `str` type has the `__iter__`
attribute in PY3 while it does not in PY2. To fix this, the check was
changed to see if the blacklist and/or whitelist were `list` types. This
however causes problems in `salt.daemons.masterapi` when we pass `set`
types.

To fix this, we just check if the whitelist and/or blacklist are string
types, rather than that they are _not_ some sort of sequence type.
 2018-05-08 09:30:21 -05:00
Ch3LL
58c4f29f96
Fix 47364: ensure we are not caching zfs.is_supported 2018-05-07 13:55:21 -04:00
rallytime
5565d5e9b1
Update old utils paths with new utils paths 2018-05-07 13:36:47 -04:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/cmdmod.py
  - salt/modules/pip.py
  - salt/modules/win_lgpo.py
  - salt/states/pip_state.py
  - tests/integration/states/test_pip.py
  - tests/support/helpers.py
  - tests/unit/modules/test_pip.py
  - tests/whitelist.txt
 2018-05-07 13:17:01 -04:00
Mike Place
a4c2df8fb2
Merge pull request #47472 from terminalmage/hashutils 
salt.utils.hashutils: Fix UnicodeEncodeError in several funcs
 2018-05-07 08:31:06 -05:00
Erik Johnson
9f7a9ebebd
Rename pip state test modules to match naming convention 
This makes the naming match the naming convention used throughout the
test suite and will make the changes in
https://github.com/saltstack/salt/pull/47337 work better.
 2018-05-04 15:03:44 -05:00
Daniel Wozniak
d20ca15c5d
Merge pull request #47447 from dwoz/strv 
Fix failing test due to windows console encoding
 2018-05-04 09:41:29 -07:00
Erik Johnson
7266c9984d
salt.utils.hashutils: Fix UnicodeEncodeError in several funcs 
Many funcs in this module only convert the input to bytes on Python 3
because the hashing and base64-encoding funcs used in this module
require bytes as input. However, on Python 2, to get bytes the input
will be coerced to a str type if it is a unicode type. This will result
in a UnicodeEncodeError when the unicode string contains non-ascii
characters.

This commit ensures that all input which is going to be encoded/hashed
is converted to a bytes type first, and also ensures that all
base64-encoded results are returned as a unicode string on Python 2 to
conform with changes that have been made in 2018.3 to use unicode types
where possible.
 2018-05-04 11:13:29 -05:00
Nicole Thomas
fa293f8fac
Merge pull request #47435 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-04 09:05:32 -04:00
Daniel A. Wozniak
ca9393b7fb
Skip tests not applicable to windows 2018-05-03 19:55:46 -07:00
Daniel A. Wozniak
8c01773833
Use the same non decodable bytes for all tests 2018-05-03 12:58:07 -07:00
Daniel A. Wozniak
983881a2a1
Add bytes that will not decode using cp1252 2018-05-03 12:28:38 -07:00
Erik Johnson
3ab332ad0e
Update tests to reflect bugfix 2018-05-02 15:21:39 -05:00
rallytime
a94cdf8a0d
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/daemons/flo/zero.py
  - salt/minion.py
  - salt/pillar/pillar_ldap.py
  - salt/transport/zeromq.py
  - salt/utils/async.py
  - salt/utils/zeromq.py
  - tests/integration/modules/test_service.py
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_pip.py
 2018-05-02 15:00:40 -04:00
Shane Lee
f031710af2
Merge branch '2017.7' into fix_47024 2018-05-01 16:26:04 -06:00
twangboy
7c46d9d0d4
Fix integration.modules.test_pip 
Pass password as kwarg for runas on Windows
Fix issues with pip 10 in unit.states.test_pip
 2018-05-01 15:33:29 -06:00
Nicole Thomas
0bdfaa5ffe
Merge pull request #47368 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-01 14:56:19 -04:00
Erik Johnson
89ddb08026
Use a lambda instead of defining a one-line function 2018-04-30 14:30:01 -05:00
Erik Johnson
e03b865359
Add unit test for file.get_diff 2018-04-30 11:45:22 -05:00
Daniel Wallace
3400f829c4
Merge pull request #47374 from DSRCorporation/bugs/tornado50-2018.3 
tornado50 merge forward for 2018.3
 2018-04-29 11:29:11 -05:00
Daniel A. Wozniak
67745c1362
Older GitPython versions will not have close 2018-04-29 00:50:20 -07:00
Daniel Wozniak
a5367eaf63
Merge pull request #47388 from dwoz/test_pip_fix 
Fix missing import
 2018-04-28 11:33:14 -07:00
Daniel A. Wozniak
eb26321e8b
Fix missing import 2018-04-28 10:29:30 -07:00
Daniel Wallace
37822c0cbb
Merge pull request #47384 from dwoz/test_pip_fix 
Fix py2 version of pip test
 2018-04-28 10:13:28 -05:00
Daniel A. Wozniak
a37a9da1fb
Fix py2 version of pip test 2018-04-28 02:24:39 -07:00
Daniel A. Wozniak
1570708fac
Close the repo and fix multiple tests 2018-04-28 01:32:02 -07:00
Daniel A. Wozniak
068f2d430d
Always sign and verify bytes 2018-04-27 16:20:18 -07:00
Daniel A. Wozniak
7810ebaba9
Add sign regression tests 2018-04-27 16:14:29 -07:00
Daniel A. Wozniak
f4441c3a1c
Adding regression test for 47124 2018-04-27 16:03:03 -07:00
Pedro Algarvio
4ae33c5d9a
Run off of a temporary config 2018-04-27 23:41:38 +03:00
rallytime
c7b73d132e
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-04-27 13:45:13 -04:00
rallytime
13e8124031
Merge branch '2017.7' into '2018.3' 
Due to the many merge conflicts created from #47106 against the 2017.7 branch
and #46002 against the 2018.3 branch, the changes from #47106 have been largely
removed from this merge forward and the HEAD of 2018.3 was taken.

A separate fix for Tornado 5.0 support will need to be made directly against the
2018.3 branch.

Conflicts:
  - doc/topics/development/conventions/formulas.rst
  - salt/master.py
  - salt/minion.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/zfs.py
  - salt/transport/ipc.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/async.py
  - tests/support/helpers.py
  - tests/support/parser/cover.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_ssh.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_safe_walk.py
 2018-04-27 13:38:35 -04:00
Nicole Thomas
31db8ca7ad
Merge pull request #47347 from dwoz/test_mysql_fix_again 
Proper fix for mysql tests
 2018-04-27 13:27:52 -04:00
Daniel A. Wozniak
add78fb618
Fix linter warnings 2018-04-27 09:04:01 -07:00
Erik Johnson
37a13d8004
Update pip unit tests to reflect changes 2018-04-27 09:47:18 -05:00
Erik Johnson
7f86779be0
Lint fix 2018-04-27 09:18:53 -05:00
Daniel A. Wozniak
2644cc7553
Fix linter nits 2018-04-27 01:22:39 -07:00
Daniel A. Wozniak
799c601184
Proper fix for mysql tests 2018-04-27 00:22:50 -07:00
Daniel A. Wozniak
94a70e847a
Ignore gitfs tests when symlinks not enabled 2018-04-26 23:51:28 -07:00
twangboy
3e6e524eca
Fix some tests`` 2018-04-26 22:37:15 -06:00
Daniel Wozniak
dac04261b5
Merge pull request #47342 from dwoz/test_mysql_fix 
Fix mysql test cases
 2018-04-26 17:50:52 -07:00
Daniel A. Wozniak
7496f4c5a8
Fix mysql test cases 2018-04-26 15:42:46 -07:00
Daniel Wozniak
e4779f3246
Merge pull request #47339 from dwoz/ssh_key_test_fix 
Use salt.utils.fopen for line ending consistancy
 2018-04-26 15:39:55 -07:00
Daniel A. Wozniak
e37a93a1ca
Remove redundent close call 2018-04-26 13:47:11 -07:00
Daniel A. Wozniak
b2ae5889b7
Close the temporary file handle 2018-04-26 12:52:08 -07:00
Daniel A. Wozniak
9f7f83a975
Use salt.utils.fopen for line ending consistancy 2018-04-26 12:43:51 -07:00
Daniel A. Wozniak
dcb6a22c00
Remove un-needed string-escape 2018-04-26 11:28:25 -07:00
Nicole Thomas
44f19b2f94
Merge pull request #47113 from jfindlay/iptables_state 
Support proto for IPSec policy extension in iptables state
 2018-04-25 14:01:18 -04:00
Nicole Thomas
b7a6206330
Merge pull request #47302 from Ch3LL/dead_code 
Remove unnecessary code from core grains and add test
 2018-04-25 13:58:47 -04:00
Nicole Thomas
fff4f8c1a5
Merge pull request #47280 from gtmanfred/localectl 
make sure not to send invalid information
 2018-04-25 13:46:44 -04:00
Nicole Thomas
0d9d55e013
Merge pull request #47106 from DSRCorporation/bugs/tornado50 
Tornado50 compatibility fixes
 2018-04-25 11:32:36 -04:00
Ch3LL
daa68b4877
Add virtual grains test for core grains 2018-04-25 11:03:35 -04:00
Nicole Thomas
89daf4fdc7
Merge pull request #47060 from OrlandoArcapix/Issue47059-return_dict_from_state 
Return an empty dict for 'changes' instead of 'None'
 2018-04-25 10:55:23 -04:00
Daniel Wallace
7c212cbb2d
fix pylint 2018-04-25 08:59:25 -05:00
Daniel Wallace
6754787e8e
update localemod tests 2018-04-24 13:38:46 -05:00
Gareth J. Greenaway
a2a8d78cb0
Fixing status beacon tests. 2018-04-24 08:00:06 -07:00
Gareth J. Greenaway
c87d6cae23
Ensure the salt_proxy is returning the correct tuple when the configuration is valid. Update various beacon unit tests to ensure they are testing the results of the validate function for a True result. 2018-04-24 08:00:06 -07:00
Gareth J. Greenaway
bcdef641e8
Removing target and tgt_type from the cmdline that is passed along to Salt, the target is used else where and including it in the cmdline causes problem when it is passed along. Adding an additional test to ensure we are getting the right targt. 2018-04-23 20:14:51 -07:00
Mike Place
2ed4b38b02
Merge pull request #47142 from garethgreenaway/47047_passing_pillar_to_slack_aliases 
[2018.3] pillar and output formatting fixes to Slack engine
 2018-04-23 13:55:06 -06:00
Justin Findlay
8bd08012ee
modules,states.iptables support proto for policy ext 2018-04-23 12:33:47 -07:00
Benedikt Werner
0197c3e973
Fix pip test 2018-04-23 21:05:15 +02:00
Nicole Thomas
370feadbd2
Merge pull request #47186 from dmurphy18/zfs_backport_46933 
backport of issue 46933, updated ZFS handling to Salt 2018.3.x
 2018-04-23 10:07:05 -04:00
Benedikt Werner
34bf66c09f
Fix pip.installed with pip>=10.0.0 2018-04-21 13:08:08 +02:00
Pedro Algarvio
6706b3a2d1
Run off of a temporary config 2018-04-20 17:02:52 +01:00
rallytime
bee4948df1
Lint: use full path for event utils function 2018-04-20 09:35:33 -04:00
Orlando Richards
5378e4fd07 Update grafana_datasource test to check for empty dict being returned on no changes, rather than None 2018-04-20 10:04:30 +01:00
Gareth J. Greenaway
6f183e1d80
Initial commmit for unit/engines/test_slack_engine 2018-04-19 18:29:49 -07:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/pip.py
  - salt/states/pip_state.py
  - salt/states/virtualenv_mod.py
  - tests/integration/modules/test_status.py
 2018-04-19 17:15:20 -04:00
Nicole Thomas
1947ffdf56
Merge pull request #47122 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-04-19 16:44:17 -04:00
Nicole Thomas
291cca7ed8
Merge pull request #47162 from terminalmage/bp-47161 
Partial backport of #47161 to 2018.3 branch
 2018-04-19 15:28:46 -04:00
David Murphy
3f30ab2ed6 ZFS backport of 46933 to 2018.3.1 2018-04-19 12:08:58 -06:00
rallytime
878fa06134
Test fix: remove tornado testing lib from class 
This use in the test class causing a failure in this branch that doesn't occur
in the 2017.7 branch. This tornado lib is also not necessary for this particular
test class.

This might cause a failure in the windows tests, but I have already spoken
to @dwoz about this and he is going to address this in a separate PR if needed.
 2018-04-19 12:04:58 -04:00
Erik Johnson
048728d2b7
Remove unused imports 2018-04-18 19:46:32 -05:00
Erik Johnson
879c557264
Use decorators for temp files/dirs in test suite 
This adds a new decorator which creates a temporary directory and cleans
it after the test completes. It also modifies an existing decorator for
creating temporary files so that it accepts arguments, which will be
passed through to salt.utils.files.mkstemp().
 2018-04-18 19:46:29 -05:00
Erik Johnson
d185f97a47
mocked file_roots and pillar_roots should be dicts 2018-04-18 13:20:07 -05:00
Nicole Thomas
d5997d2301
Merge pull request #47110 from kstreee/fix-misusing-of-timeout 
Fixes misusing of the timeout option.
 2018-04-18 13:16:19 -04:00
Nicole Thomas
b96ce23b3f
Merge pull request #47104 from terminalmage/issue46929 
yamlloader: Properly handle colons in inline dicts
 2018-04-18 12:22:46 -04:00
Nicole Thomas
eb5ac51a48
Merge pull request #47102 from gtmanfred/2017.7 
dont allow using no_use_wheel for pip 10.0.0 or newer
 2018-04-17 16:44:57 -04:00
rallytime
a40f007962
lint: get_context is in stringutils.py now 2018-04-17 16:29:48 -04:00
Daniel Wallace
3dc93b310b
fix tests 2018-04-17 13:18:18 -05:00
rallytime
3416e398c6
Update old utils paths references to use new paths 2018-04-17 11:02:38 -04:00
rallytime
94c2a12be6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_state.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/test_minion.py
 2018-04-17 10:54:42 -04:00
Daniel Wallace
4c07a3d1e9
fix other tests 2018-04-17 09:23:03 -05:00
kstreee
0624aee0ed
Fixes misusing of the timeout option. 2018-04-17 14:21:15 +09:00
Mike Place
ee90dd5d95
Merge branch '2018.3' into issue46909 2018-04-16 16:59:25 -06:00
Daniel A. Wozniak
3d85e30ce5
AsyncTestCase is required for AsyncEventPublisher 
Other tests that use AsyncTestCase's io_loop will break if AsyncTestCase
is not subclassed when a test instantiates AsyncEventPublisher.
 2018-04-16 14:18:08 -07:00
Mike Place
03892eaf0b
Merge pull request #47068 from cachedout/catch_value_error_socket_test 
Catch an operation on a closed socket in a test
 2018-04-16 13:56:02 -06:00
Erik Johnson
33bf6643cd
Add additional test for plain scalars 2018-04-16 12:17:20 -05:00
Erik Johnson
508659b682
yamlloader: Properly handle colons in inline dicts 
PyYAML's scanner is not written to handle Python's unicode literal
strings, since they are not part of the YAML spec. With all strings
loaded in the YAML context now being unicode types, this causes errors
when scanning the document to construct the next node. The unicode
string literal is misidentified as a plain scalar and any colons within
it are interpreted as delimiting a mapping node. Since no whitespace appears
after the colon, this causes scanning error.

To fix it, we check for this scanning error and reset the scanner's
position and check if the first char is the "u" prefix. If so, and if
the following char is a quote, then we attempt to scan for a string
literal instead.
 2018-04-16 11:29:51 -05:00
Shane Lee
673cd31c65
Merge branch '2017.7' into jinja_test_fix 2018-04-16 10:15:27 -06:00
Daniel A. Wozniak
46fa2c04de
Fix py3 os.linesep wart 2018-04-14 17:09:50 -07:00
Daniel Wozniak
7fddad6cd9
Merge pull request #47064 from dwoz/roots_tests_fix 
Fix fileserver roots tests
 2018-04-14 14:30:22 -07:00
Daniel A. Wozniak
3c565d7e54
Use salt.utils.fopen 2018-04-13 13:14:19 -07:00
Mike Place
7db5625632
Catch an operation on a closed socket in a test 
This failure wouldn't be related to the test in question so it should
be safe to ignore.
 2018-04-13 13:54:18 -06:00
Daniel A. Wozniak
25fd7c0694
fix py3 wart, encode os.linesep 2018-04-13 12:33:23 -07:00
Erik Johnson
5c4c0468ad
Fix regression in handling of environment/saltenv 
This was broken sometime between when the change was made and 2018.3.0
was released. This fixes the issue and adds a regression test.
 2018-04-13 13:44:55 -05:00
Daniel A. Wozniak
aa965310f1
Clean up cruft 2018-04-13 10:27:17 -07:00
Daniel A Wozniak
efc9866580
Jinja test fixes 2018-04-13 10:23:34 -07:00
Daniel A Wozniak
d79f1a1961
Fix fileserver roots tests 2018-04-13 10:15:13 -07:00
Matt Phillips
8af3f5b874 GH-47000: add proper handling of full_return in cmd_subset 
as noted in the original issue, full_return wasnt being handled properly. This
rectifies that.
 2018-04-13 10:58:03 -04:00
Erik Johnson
5d98a8bedd
Make salt.utils.stringutils.to_binary work for bytestrings 
Also make sure we're testing bytestring equivalents to each of the
strings in the test.
 2018-04-12 22:12:48 -05:00
Mike Place
ac2d54d78a
Merge pull request #47029 from terminalmage/issue46859 
ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types
 2018-04-12 13:41:28 -06:00
Gareth J. Greenaway
f2e484ed54
Merge branch '2018.3' into crptodomekeyfix 2018-04-12 08:12:00 -07:00
Erik Johnson
7691dee4ed
Add to_str option to decode funcs 
This allows for the string to be forced to a str type instead of
unicode on PY2.
 2018-04-11 14:41:54 -05:00
rallytime
590c7fc13f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/state.py
  - salt/utils/files.py
  - tests/integration/modules/test_pip.py
 2018-04-11 12:41:22 -04:00
Nicole Thomas
8f994e7cf9
Merge pull request #46539 from jfoboss/patch-1 
#46504 Fix
 2018-04-11 10:13:23 -04:00
twangboy
5796696617
Fix tests for Py3 
readPlistFromString has been deprecated on Python3. Use loads instead.
 2018-04-10 14:45:32 -06:00
twangboy
781880f0fc
Add _available_services function for testing 2018-04-10 14:45:31 -06:00
twangboy
6080633613
Add assert_called_with 2018-04-10 14:45:31 -06:00
twangboy
1bf70b2033
Add more tests for available_services 2018-04-10 14:45:30 -06:00
twangboy
b429fc3e74
Add tests for mac_utils 
Need help with the `available_services` tests
 2018-04-10 14:45:30 -06:00
twangboy
19c3fadbe5
Fix unit test for win_ntp 2018-04-10 12:12:17 -06:00
Ch3LL
c01180ff47
Patch ZMQ versions for master_uri test 2018-04-10 13:02:57 -04:00
Ch3LL
e972ebdf1a
Add for new source_* minion options 2018-04-10 13:02:57 -04:00
Peter Morris
44ecd13abc Update tests to use cmd.run_all 2018-04-10 01:11:03 +01:00
Daniel A Wozniak
e1995a92ee
Fix verify signature test 
We load the key to memory first now so mocking salt.utils.fopen fixes
the signature verification test
 2018-04-09 09:41:32 -07:00
Daniel A. Wozniak
0ba32118d9
Add test for bad public key without m2crypto 2018-04-06 11:22:32 -07:00
Daniel A. Wozniak
a44c356233
Clean up bad public key headers 
Remove the "RSA" delaration from public key headers generated by
pycryptodome<=3.4.6
 2018-04-06 10:56:50 -07:00
rallytime
0a297e7319
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/grains/core.py
  - salt/utils/__init__.py
 2018-04-05 13:43:51 -04:00
Mike Place
4e5e291c99
Merge pull request #46873 from terminalmage/utf8-first 
Attempt UTF-8 first when decoding/encoding
 2018-04-05 09:16:27 -05:00
Nicole Thomas
67894e3ee9
Merge pull request #46869 from gtmanfred/2018.3 
Always return dictionary for _localectl_status
 2018-04-05 09:25:13 -04:00
Nicole Thomas
18e460fc30
Merge branch '2017.7' into whitelisted_acl 2018-04-04 17:28:40 -04:00
Nicole Thomas
d7e4b9d755
Merge pull request #46729 from terminalmage/expr_match 
Performance improvement/error catching in expr_match
 2018-04-04 16:25:56 -04:00
Daniel Wallace
1496e985f7
fix pylint 2018-04-04 15:13:59 -05:00
Nicole Thomas
e0b383afb5
Merge pull request #46872 from terminalmage/bp-46863 
Backport #46863 to 2018.3
 2018-04-04 15:04:39 -04:00
Erik Johnson
f59cee28db
Remove hacky workarounds to get encode/decode tests to pass on Windows 2018-04-04 13:18:04 -05:00
Erik Johnson
be284e5b99
Add skipIf when older mock present 2018-04-04 10:54:47 -05:00
Erik Johnson
db8faaee56
Add unit tests for ext_nodes master_tops module 2018-04-04 10:53:08 -05:00
Daniel Wallace
75425dfd20
fix tests for localemod 2018-04-04 09:58:21 -05:00
rallytime
4ad50bbdee
Update old utils paths to new paths 2018-04-03 14:46:56 -04:00
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/conf.py
  - salt/loader.py
  - salt/modules/dockermod.py
  - salt/modules/sensehat.py
  - salt/utils/parsers.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_cp.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/spm/test_man_spm.py
  - tests/integration/states/test_npm.py
  - tests/unit/states/test_environ.py
 2018-04-03 14:33:11 -04:00
Nicole Thomas
ebf5dd276f
Merge pull request #46783 from twangboy/fix_46680 
Fix network.managed test=True on Windows
 2018-04-03 08:54:55 -04:00
Nicole Thomas
df26f2641e
Merge pull request #46675 from dwoz/inspectlib-tests 
Skip test when git symlinks are not configured
 2018-04-03 08:19:18 -04:00
twangboy
da5ce25ef3
Fix unit tests on Linux 2018-04-02 19:59:13 -06:00
Daniel A. Wozniak
d39f4852d8
Handle non-zero status exception 2018-03-29 14:39:40 -07:00
Daniel A. Wozniak
83c005802b
Handle cases where git can not be found 
Signed-off-by: Daniel A. Wozniak <dwozniak@saltstack.com>
 2018-03-29 14:39:29 -07:00