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
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
77a75ebdcf
Merge pull request #48212 from Ch3LL/py3_ec2
...
Fix python3 ec2 salt-cloud TypeError when installing salt
2018-06-20 12:00:20 -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
Nicole Thomas
1f88df6e89
Merge pull request #48210 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2018.3.1 to 2018.3
2018-06-20 09:43:18 -04:00
Ch3LL
c4334f3f14
Fix UnicodeDecodeError when reading file to determine virtual grain
2018-06-19 16:38:28 -04:00
Ch3LL
b0d75f459a
Fix python3 ec2 salt-cloud TypeError when installing salt
2018-06-19 15:17:39 -04:00
Daniel Wallace
5b4897f050
Merge pull request #48186 from rallytime/saltcheck-docs
...
Add autodoc module for saltcheck.py
2018-06-19 14:03:54 -05: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
382df48a72
Removed useless new line
2018-06-19 14:30:43 -04:00
J. Eduardo
5aa99d14c4
Added unit tests for CRL creation and certificate revocation with CRL
2018-06-19 14:30:38 -04:00
J. Eduardo
cc12844922
Fixed a problem where the OpenSSL bindings refuse to consume unicode
...
strings.
2018-06-19 14:30:32 -04:00
J. Eduardo
399cf08860
Stopped converting the certificate hexadecimal serial number to an integer in order to avoid breaking CRLs.
2018-06-19 14:30:25 -04:00
Nicole Thomas
7274a33c80
Merge pull request #48191 from twangboy/fix_pip_check
...
Use the --disable-pip-version-check option
2018-06-19 14:13:43 -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
Nicole Thomas
2a8e1c6539
Merge pull request #48179 from ezh/2018.3-auth
...
2018.3 auth
2018-06-19 10:16:39 -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
0231008cf8
Merge pull request #48188 from gtmanfred/2018.3
...
allow virtual aliases to be used for the driver name
2018-06-18 17:49:15 -04:00
Mike Place
0f95238dca
Merge pull request #48116 from KaiSforza/pr-lint-2018
...
Add jenkinsfiles to define tests in 2018
2018-06-18 23:27:09 +02: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
twangboy
5c00fce6bf
Use the --disable-pip-version-check option
2018-06-18 19:06:10 +00:00
Erik Johnson
71eeae1240
Update mount module unit tests to reflect changes in mock_open
2018-06-18 13:39:52 -05:00
Daniel Wallace
45249d3e10
allow virtual aliases to be used for the driver name
...
This checks if the driver name for cloud is in any passed in
virtual_aliases.
2018-06-18 12:47:13 -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
Alexey Aksenov
b84c4321c4
Add more verbose debug messages for auth subsystem
2018-06-18 17:39:09 +03:00
rallytime
314fc2d889
Clean up some doc references
2018-06-18 10:28:22 -04:00
rallytime
da7603d879
Add autodoc module for saltcheck.py
2018-06-18 09:50:19 -04:00
Nicole Thomas
60c9490bdc
Merge pull request #48164 from garethgreenaway/48146_mysql_output_to_file
...
[2018.3] Fixes to mysql state
2018-06-18 09:10:19 -04: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
