valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
93,724 Commits 24 Branches 182 Tags 341 MiB
1f093cef4a
Commit Graph

13429 Commits

Author SHA1 Message Date
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
Gareth J. Greenaway
8efd33320f
Normalize the mode before we compare it. 2018-07-02 09:11:42 -07:00
Gareth J. Greenaway
2454652914
Normalize the mode before we compare it. 2018-07-02 09:06:22 -07:00
Gareth J. Greenaway
08ad5665de
Fixing test to ensure it works under py3 2018-07-02 08:51:55 -07: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
Gareth J. Greenaway
f894f0ecb8
Setting the mode with setuid or setgid bits in addition to setting the owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group. 2018-07-01 12:33:10 -07:00
Gareth J. Greenaway
2b25d8c95b
Setting the mode with setuid or setgid bits in addition to setting the owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group. 2018-07-01 12:19:48 -07: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
Nicole Thomas
89857ea8b9
Merge pull request #48297 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-30 08:57:34 -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
2cbcb4fd26
Add user and group to makedirs cmd in file.copy 2018-06-29 10:39:02 -04:00
Daniel A. Wozniak
e8362adf71
fopen does not support encoding 2018-06-28 10:16:52 -07:00
Ch3LL
a964db4663
Fix corrupt public key with m2crypto python3 2018-06-28 11:31:21 -04:00
Daniel A. Wozniak
487161ba8f
Fix file encoding on windows 2018-06-27 18:33:18 -07:00
Daniel A Wozniak
fc760685ee
Fix multiple git module tests 2018-06-27 18:28:58 -07: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
Nicole Thomas
34b24bb7fa
Merge branch '2018.3' into issue47937 2018-06-27 13:41:34 -04:00
Erik Johnson
c636b18cf0
Add unit test for tojson filter 2018-06-27 12:23:29 -05:00
Nicole Thomas
21ed5b97ce
Merge pull request #48295 from rallytime/bp-48193 
Back-port #48193 to 2017.7
 2018-06-26 19:42:17 -04:00
Ch3LL
5d6135e1e2
Fix macosx grains when swapusage returns comma 2018-06-25 18:03:57 -04:00
Nicole Thomas
caf630487c
Merge pull request #48207 from rallytime/bp-48189 
Back-port #48189 to 2017.7
 2018-06-25 15:26:55 -04:00
rallytime
1c8bd35f28
Update old utils paths to use new utils paths 2018-06-25 10:45:24 -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
Thomas Jackson
c0180ff33d
Properly configure syndic in test case 
Without this option we aren't really a syndic and it won't wait
 2018-06-25 10:26:30 -04:00
rallytime
e9d09e0375
Use old is_windows utils path on 2017.7 2018-06-25 10:06:37 -04:00
Nicole Thomas
3327181507
Merge pull request #48234 from dwoz/thin_dir 
Fix py2 thin dir issues
 2018-06-25 09:33:01 -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
Gareth J. Greenaway
aea4f7ae14
Fixing test_local_batch 2018-06-24 16:03:47 -07:00
Erik Johnson
830a624ce8
Ignore IOError when tearing down filehandles not opened for reading 2018-06-23 21:28:34 -05:00
Erik Johnson
3b6356f4b0
Raise TypeError when trying to read from filehandles not opened for reading 2018-06-23 21:27:58 -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
Erik Johnson
0e8c83bac6
2 MockFH enhancements: 
1. Raise appropriate TypeErrors when wrong type is written
2. Don't raise exception about read_data unless we actually try to read
   from the filehandle. This makes it a bit more permissive when testing
   code where the file is only being written to.
 2018-06-23 15:00:26 -05:00
Gareth J. Greenaway
ce3e1eaf2c
Removing sort. 2018-06-23 11:25:46 -07:00
Gareth J. Greenaway
83accf3b20
Fixing test_local_batch 2018-06-22 12:19:41 -07:00
Gareth J. Greenaway
85cef126e0
Adding note about why salt.utils.versions is being re-imported. Adding a test for local_batch. 2018-06-22 12:19:40 -07: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
Daniel A. Wozniak
70c603451b
Fix py2 thin dir issues 2018-06-20 17:16:30 -07: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
Ch3LL
236773e3e9
Skip new sha256 files on repo.saltstack.com/windows 2018-06-20 14:28:31 -04: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
Daniel Wallace
b965d6c9b3
If pip binary is passed to bin_env, use that pip binary 
We don't need to do a lookup for python to then run `python -m pip`
because we already know where pip is.

Fixes using /bin/pip3

Fixes #48122
 2018-06-19 14:09:11 -04:00
Nicole Thomas
96f79b0674
Merge pull request #48189 from gtmanfred/pip 
If pip binary is passed to bin_env, use that pip binary
 2018-06-19 14:08:12 -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
1cbe89feee
Implement tell() for filehandle iteration 2018-06-18 16:23:35 -05:00
Daniel Wallace
96c59f3d93
If pip binary is passed to bin_env, use that pip binary 
We don't need to do a lookup for python to then run `python -m pip`
because we already know where pip is.

Fixes using /bin/pip3

Fixes #48122
 2018-06-18 16:21:58 -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
38df912fa6
Operate on a copy of the read_data 
This keeps us from mangling it if it contains lists, which we would be
popping items off of. We don't want to pop items from the list that was
passed in.
 2018-06-18 14:45:40 -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
Alexey Aksenov
9ed2d2ec55 Fix integration.shell.test_key and integration.shell.test_runner 2018-06-18 17:39:35 +03:00
Alexey Aksenov
26a6f79730 Fix integration tests test_list_acc_wrong_eauth, test_salt_run_with_wrong_eauth 2018-06-18 17:39:23 +03:00
Erik Johnson
2556a1e13d
Remove unused import 2018-06-18 07:23:52 -05:00
Erik Johnson
fd9d700157
Add additional docs to MockOpen class 2018-06-18 00:28:06 -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
fc0aa9934f
Track call_count in MockOpen 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
51b3faa7b4
Add support for passing multiple strings for a given match in read_data 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
f5823252bb
Track call args/kwargs in MockFH 
This allows for them to be verified in tests
 2018-06-18 00:21:25 -05:00
Erik Johnson
335591ca90
Mock the seek function in MockFH 2018-06-18 00:21:25 -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
2be19cfa89
Report correct location when reading using explicit size and EOF reached 2018-06-18 00:21:25 -05:00
Erik Johnson
5ec95ba5ca
On second thought, actually implement tell() 2018-06-18 00:21:25 -05:00
Erik Johnson
19022eb9e5
Add tell mock to MockFH 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
836fde9a30
Allow Python 2 to accept an exception as read_data 2018-06-18 00:21:25 -05:00
Erik Johnson
543385fd02
Add writelines_calls property 2018-06-18 00:21:25 -05:00
Erik Johnson
42fa842456
Make read funcs mocks so their calls can be tracked 
Also add a property func as a shorthand to return all the write calls
for a given filehandle.
 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
b9200dbc3e
add a dict containing the handles to the mock_open return object 
This allows tests to access the MockFH objects opened during the
execution of the unit test.
 2018-06-18 00:16:03 -05:00
Erik Johnson
852ba4b982
Add mocked close() function to MockFH 2018-06-18 00:16:02 -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
1861e9b944
mock_open: rewrite multi-file support 
The initial approach tied all opened files to the same mocked
filehandle. This new approach moves all the read functions into a class,
and then uses a separate instance of that class for each opened file.
 2018-06-18 00:16:02 -05:00
Erik Johnson
5e6b539770
Use function for empty string 
Missed this when making changes for multi-file support
 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
5d09b178d7
Separate mocked file contents per filename, not glob 
This allows for multiple opens of a file matching the same glob.
Otherwise, subsequent opens would already be at EOF.
 2018-06-18 00:16:02 -05:00
Erik Johnson
875102f538
Modify mock_open to support multiple file paths 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
8ba6cadac7
More mock_open bugfixes 
This makes readline() a regular function and not an iterator. It also
makes the different side_effect functions all operate on the same
generator representing the file contents, and adds support for reading
an explicit amount of bytes from the file. The side effect functions can
now be run one after another and the mocked filehandle will work
properly.
 2018-06-18 00:16:02 -05:00
Erik Johnson
2c64b270df
Add timestamp to the minion's log_fmt_console 
This makes salt-call show timestamps in stdout/stderr when run from
integration tests (e.g. in ShellCase.run_script).
 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
Ch3LL
48b5d2e9d3
Add timeout argument to run_salt for ShellCase 2018-06-14 16:19:33 -04: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
Nicole Thomas
b10b7355a0
Merge pull request #48054 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-13 08:58:45 -04:00
Erik Johnson
248467edac
Add regression test for _generate_minion_id() 2018-06-13 01:13:43 -05:00
Erik Johnson
e6a4744f85
Use errno instead of hard-coding error 2 2018-06-13 01:11:55 -05:00
Erik Johnson
ff63f36932
Fixes / enhancements for mock_open 
This makes the following changes:

1. Now works properly when read_data is a bytestring
2. Now works properly when mocked filehandle is iterated (e.g. `for line in fh:`)
3. Adds ability to make mocked filehandle raise an IOError when the path
   being opened doesn't match a pattern (or one of a list of patterns).
 2018-06-13 01:05:44 -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
Daniel Wallace
d8c035e5e5
mark test as expensive 
This tests takes a large amount of cpu to run, and is causing tests to
hang.

Mark it as an expensive test so it only runs with the cloud tests.
 2018-06-11 16:08:10 -05:00
rallytime
508d70fabf
Update old utils paths to use new paths 2018-06-11 11:49:10 -04: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
b33a0b5eaa
Switch to trace level logging for further test failure troubleshooting 2018-06-08 17:06:49 -05: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
Nicole Thomas
871a910fcb
Merge pull request #48009 from dwoz/winswarmfix 
minionswarm runs on windows
 2018-06-08 09:52:35 -04:00
Mike Place
ea85f882bc
Merge pull request #47915 from garethgreenaway/state_runner_pause_resume_kill 
[2018.3] state runner pause resume kill
 2018-06-07 10:08:29 -06:00
Gareth J. Greenaway
f457f9cb84
Adding a test to ensure archive.list returns the right results when a tar file contains a file with unicode in it's name. 2018-06-06 21:23:28 -07:00
Nicole Thomas
0dcaead36d
Merge pull request #47968 from gtmanfred/2017.7 
Clean up tox + pytest
 2018-06-06 17:23:51 -04:00
Daniel A Wozniak
5027c7bb84
minionswarm runs on windows 2018-06-06 14:19:16 -07:00
Gareth J. Greenaway
4377e0cc08
Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality. 2018-06-06 13:52:45 -07: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
Nicole Thomas
76068c83f5
Merge pull request #47976 from terminalmage/salt-jenkins-1000 
Capture and log output of processes that timed out and were killed
 2018-06-06 15:17:08 -04:00
Nicole Thomas
42dd6b83eb
Merge pull request #47978 from twangboy/fix_test_pkg 
Add try/finally, fix typo in 7zip def file
 2018-06-06 15:06:03 -04:00
Nicole Thomas
a67b21ef3d
Merge pull request #47959 from twangboy/fix_test_service 
Fix failing test when service doesn't exist
 2018-06-06 15:05:42 -04: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
Gareth J. Greenaway
7b7fb1f5d5
Adding missing test sls file. 2018-06-06 09:00:42 -07:00
Gareth J. Greenaway
54e51bc627
Backporting #47843 to 2017.7, updating test for 2017.7. 2018-06-06 09:00:42 -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
Erik Johnson
41e5a75027
Add catch_timeout to run_script 
One of the tests depends on forcing a timeout, but since we no longer
include the timeout message in the stdout/stderr return, we needed a way
to return whether or not the script timed out.
 2018-06-06 09:04:09 -05: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
Daniel Wallace
5a41f484ef
add EXPENSIVE_TESTS 2018-06-05 18:36:27 -05:00
Daniel Wallace
055cd5a6ba
set DESTRUCTIVE_TESTS environment variable for pytest 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
twangboy
8bb36b3a4b
Add try/finally, fix typo in 7zip def file 2018-06-05 13:29:49 -06:00
Erik Johnson
551ada8e4d
Capture and log output of processes that timed out and were killed 
Before, tests.support.case.ShellTestCase.run_script would just go
¯\_(ツ)_/¯ and return that it killed the process. But you can still run
`.communicate()` on a process that was terminated, so this commit does
that and uses it to log the output from the killed process.
 2018-06-05 13:33:39 -05:00
Erik Johnson
4a8260a5e5
Add tests for git.cloned state 2018-06-05 12:32:40 -05: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
twangboy
0cd47aa81e
Remove unused import 2018-06-04 18:12:16 -06:00
twangboy
d4b42540e3
Fix failing test when service doesn't exist 2018-06-04 18:09:12 -06: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
Nicole Thomas
484d83014b
Merge pull request #47557 from L4rS6/fix-broken-rabbitmq-list-policies 
fix broken rabbitmq list policies in rabbitmq version 3.7
 2018-06-04 09:25:06 -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
Erik Johnson
9c369c6aa8
Remove temp logging from test 
It's now being logged in run_script itself
 2018-06-04 00:19:30 -05:00
Erik Johnson
af02d5ba7b
Add result logging to run_script, make returns DRY 2018-06-04 00:17:41 -05:00
Erik Johnson
fb66368af9
Update test logging for salt-jenkins 1000 2018-06-02 21:39:17 -05:00
rallytime
7e1d278d19
Update old utils paths to use new utils paths 2018-06-01 15:00:46 -04: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
Nicole Thomas
a2b588299b
Merge pull request #47860 from terminalmage/state-writing-docs 
Clean up doc build warnings, add best practices for writing states
 2018-06-01 10:42:54 -04:00