91714 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	8e214c9fa9	file.managed: Add test to ensure binary contents work	2018-04-12 22:16:56 -05:00
Erik Johnson	7b7dc94610	Use salt.utils.stringutils.is_binary to check if contents are binary	2018-04-12 22:16:34 -05:00
Erik Johnson	e3c969da81	PY3: Ensure binary contents work with file.managed	2018-04-12 22:13:59 -05: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
Erik Johnson	1024000369	Force null bytes to be str types ... When doing membership checks in a string, the string which is being checked will be coerced to unicode if the null byte is a unicode type, leading to a UnicodeDecodeError. This fixes that by forcing the null byte literals to be str types. If the string on which the membership check is being performed is a unicode type, then it will work just fine since a null byte that is a str type will cleanly decode to a unicode type even when the system encoding is ascii.	2018-04-12 17:52:38 -05:00
Daniel Wallace	d3be828696	Merge pull request #47021 from garethgreenaway/920_state_module_jinja_filters_test_test_path_which ... [2018.3] Fixing integration.modules.test_state_jinja_filters.StateModuleJinjaFiltersTest.test_path_which	2018-04-12 08:12:38 -05:00
Nicole Thomas	66e8445b82	Merge pull request #47022 from corywright/add-auth-file-module-to-docs ... Add auth.file module to auth documentation page	2018-04-11 17:11:09 -04:00
Cory Wright	bd0918fc40	Add auth.file module to auth documentation page	2018-04-11 11:40:00 -04:00
Gareth J. Greenaway	2ccf2c5fe0	Fixing test_path_which to check that the filter is available rather than results.	2018-04-11 08:19:07 -07:00
Nicole Thomas	12ecfdee93	Merge pull request #45774 from twangboy/mac_add_service_util ... Fix __virtual__ issue in mac_system.py	2018-04-11 10:26:12 -04:00
Nicole Thomas	79347f108a	Merge pull request #47012 from terminalmage/issue46953 ... Azure: ensure subscription_id is a str type	2018-04-11 09:57:07 -04:00
Erik Johnson	5192622a32	Azure: ensure subscription_id is a str type ... Resolves #46953.	2018-04-11 02:21:27 -05: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	7b40218790	Fix lint, remove sentence from docstring	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	b5f67130cc	Used *args and **kwargs	2018-04-10 14:45:30 -06:00
twangboy	ed061617a2	Fix unicode_literal issue in mac_assistive	2018-04-10 14:45:29 -06:00
twangboy	82e17e5fc8	Fix args/kwargs	2018-04-10 14:45:29 -06:00
twangboy	455146500a	Move some functions into mac_utils	2018-04-10 14:45:28 -06:00
twangboy	125586264b	Add utils\mac_service.py	2018-04-10 14:45:28 -06:00
Nicole Thomas	6503bf8dfa	Merge pull request #46526 from Ch3LL/ip_conf ... Add tests for new source_* minion options	2018-04-10 15:56:45 -04:00
Nicole Thomas	03907d3fce	Merge pull request #46993 from L4rS6/fix-broken-keystone-auth/2018.3 ... Fix: tuple instead of string	2018-04-10 13:07:58 -04:00
Nicole Thomas	ffaee26540	Merge pull request #46990 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-04-10 13:07:32 -04:00
Nicole Thomas	a34b92ae82	Merge pull request #46339 from DSRCorporation/bugs/ssh_state_test_failures ... SSH State test failures	2018-04-10 13:06:50 -04:00
Ch3LL	c01180ff47	Patch ZMQ versions for master_uri test	2018-04-10 13:02:57 -04:00
Ch3LL	da38f332a5	Change comment and salt.utils.network import	2018-04-10 13:02:57 -04:00
Ch3LL	e972ebdf1a	Add for new source_* minion options	2018-04-10 13:02:57 -04:00
Nicole Thomas	9924100c44	Merge pull request #46989 from Ch3LL/redis_log ... Fix redis cache log debug line	2018-04-10 12:35:11 -04:00
Nicole Thomas	c6431936cb	Merge pull request #46848 from garethgreenaway/testing_jinja_filters_avaiable_via_salt_ssh ... [2018.8] salt-ssh jinja filters tests	2018-04-10 12:19:50 -04:00
Nicole Thomas	fbbcb7584c	Merge pull request #46973 from rallytime/fix-46880 ... New "apply_to" kwarg in rabbitmq module should be added at the end	2018-04-10 10:42:31 -04:00
rallytime	ccc5bad2df	Merge branch '2017.7' into merge-2018.3 ... Conflicts: - .kitchen.yml	2018-04-10 10:23:02 -04:00
Nicole Thomas	ba5421d988	Merge pull request #46991 from gtmanfred/windows ... use saltstack salt-jenkins	2018-04-10 10:18:59 -04:00
Daniel Wallace	98588c1dc5	use saltstack salt-jenkins	2018-04-10 09:15:50 -05:00
Lars Wagner	e33ba1b3d5	Fix: tuple instead of string	2018-04-10 16:12:54 +02:00
rallytime	2f1cf3e511	Merge branch '2017.7' into '2018.3' ... Conflicts: - .kitchen.yml	2018-04-10 10:11:35 -04:00
Ch3LL	6160bc06c6	Fix redis cache log debug line	2018-04-10 10:09:49 -04:00
Nicole Thomas	58f59cfbff	Merge pull request #46966 from terminalmage/issue46934 ... Fix traceback when attempting to decode binary data to unicode	2018-04-10 10:08:34 -04:00
Nicole Thomas	00c4067585	Merge pull request #46975 from gtmanfred/windows ... Make windows work for test runs in jenkinsci	2018-04-10 09:41:17 -04:00
Nicole Thomas	e33e792e2a	Merge pull request #46944 from garethgreenaway/46881_Cron_file_source_file_not_found ... [2018.3] cron.file with salt source URL	2018-04-10 09:34:02 -04:00
Nicole Thomas	5fcda3eff8	Merge branch '2018.3' into testing_jinja_filters_avaiable_via_salt_ssh	2018-04-10 09:25:45 -04:00
Gareth J. Greenaway	438aafeb03	Adding kwargs to calls into file module functions	2018-04-09 19:50:04 -07:00
Gareth J. Greenaway	0adfee9b11	Updating a couple tests. Fixing check_whitelist_blacklist to work with PY3 when non-iterables are passed. Adding warning about lst_avg results being wrong and future updates in Neon.	2018-04-09 19:38:18 -07:00
Daniel Wallace	1f69c0d7f8	make sure windows outputs xml junit files	2018-04-09 14:43:15 -05:00
rallytime	8ce21f982c	New "apply_to" kwarg in rabbitmq module should be added at the end ... The change in #41233 added the "apply_to" kwarg to rabbitmq.set_policy. Since the arg was not added at the end of the kwarg list, there was an API change. In addition, when the order of "apply_to" and "priority" was swapped, the corresponding kwargs were not changed, which causes a stack trace and the rabbitmq_policy state to fail. This change fixes #46880 so that the policy option will work correctly and we can avoid this API change for the module. In 2017.7.x versions of Salt, the order of args/kwargs is `vhost`, `name`, `pattern`, `definition`, `priority`, and then `runas`. Therefore, `apply_to` must be last. Fixes #46880	2018-04-09 15:19:28 -04:00
Daniel Wallace	4a2ec1bbb3	support new versions of winrm-fs	2018-04-09 12:12:14 -05:00
Erik Johnson	df43ffdb8f	salt.payload.Serial: fix traceback when unpacking binary blob	2018-04-09 11:35:46 -05:00
Erik Johnson	40a49358c9	gpg renderer: fix tranceback when decrypted ciphertext contains binary data	2018-04-09 11:34:50 -05:00