93221 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Gareth J. Greenaway	9373dff52b	Update test_pkgrepo.py	2018-04-11 10:55:36 -04:00
Gareth J. Greenaway	13cf9eb5b1	Removing debugging.	2018-04-11 10:55:36 -04:00
Gareth J. Greenaway	a61a8593e5	Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments.	2018-04-11 10:55:36 -04:00
rallytime	b67e86e11b	Fix poor merge-conflict resolution: "translate_new_lines" doesn't exist in develop.	2018-04-11 10:48:48 -04:00
Nicole Thomas	1d1c9f71b5	Merge pull request #45313 from NTmatter/45274-trafficserver-popen-arguments ... modules.trafficserver: Use lists for popen's commands and arguments	2018-04-11 10:34:00 -04: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
Bo Maryniuk	515a83a72a	Set master_top_first to False by default	2018-04-11 16:20:32 +02:00
Nicole Thomas	8f994e7cf9	Merge pull request #46539 from jfoboss/patch-1 ... #46504 Fix	2018-04-11 10:13:23 -04:00
Nicole Thomas	6239033541	Merge pull request #47014 from brejoc/develop-fix-for-grain-test-core ... Test is now also working with Python2	2018-04-11 10:10:42 -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
Adam Bolte	6837d6c138	Replace failing is and is not tests with == and != ... With the introduction of unicode_literals, these str to unicode comparisons were incorrectly always returning False. Fixes #46917.	2018-04-11 09:55:18 -04:00
Daniel Hobley	838670f626	Don’t encode a unicode string ... - We can’t encode once it’s already encoded	2018-04-11 15:18:39 +02:00
Jochen Breuer	c22c81304f	Test is now also working with Python2 ... Since assertCountEqual was Python>=3.2 only, we backported this to Python2.	2018-04-11 10:51:20 +02:00
Erik Johnson	5192622a32	Azure: ensure subscription_id is a str type ... Resolves #46953.	2018-04-11 02:21:27 -05:00
jfoboss	6890122e41	Merge pull request #1 from twangboy/pull_46539 ... Fix unit test for win_ntp	2018-04-11 10:01:53 +03:00
Gareth J. Greenaway	f0fadbb4ce	Fixing indention for slack documention. Updating try..except to ensure we catch when groups aren't dicts.	2018-04-10 17:52:08 -07:00
Gareth J. Greenaway	dc2a72d44f	Fixing aliases in slack engine	2018-04-10 17:42:07 -07:00
Ari Maniatis	5db36d7bdb	Remove salt FreeBSD repo which is now 2 years out of date ... The saltstack repository has the 2016 version is current. Its not being updated, but there is a perfectly good port in the FreeBSD tree to use instead. Enhance the documentation on how to install that from binary or source.	2018-04-11 08:39:26 +10:00
Nicole Thomas	74d70e95a5	Merge pull request #46999 from gtmanfred/2017.7 ... switch pip test package	2018-04-10 17:18:32 -04:00
Nicole Thomas	d61fdd97fb	Merge branch 'develop' into nested-orch-highstate	2018-04-10 16:55:57 -04:00
lomeroe	369a0645ed	move exception for clarity	2018-04-10 15:50:25 -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
Mike Place	511c8fa04d	Merge branch 'develop' into 45274-trafficserver-popen-arguments	2018-04-10 14:11:07 -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	8adaf7f526	Merge pull request #46023 from bloomberg/parallel-orch ... add parallel support for orchestrations	2018-04-10 15:26:03 -04:00
Daniel Wallace	791af8f6ce	switch pip test package ... Using irc3-plugins-test, since this should never be updated (i manage it and it is fulfilling its only job).	2018-04-10 14:09:20 -05:00
Nicole Thomas	fa9c3c0e7c	Merge pull request #46515 from gtmanfred/develop ... allow excluding multiple directories in rsync	2018-04-10 14:34:02 -04:00
Luke Carrier	2df3b0d4ba	Fix respository (=> repository) typo in sls_build ... This typo looks to have been introduced with 64aa4fb and would affect anyone relying on the deprecated "name" attribute.	2018-04-10 19:24:19 +01:00
twangboy	19c3fadbe5	Fix unit test for win_ntp	2018-04-10 12:12:17 -06:00
Nicole Thomas	fb035953f6	Merge pull request #46995 from s0undt3ch/develop ... [schedule][develop] Minor fixes and enhancements	2018-04-10 13:51:10 -04:00
Mike Place	0ac0b3ca29	Merge branch '2017.7' into parallel-orch	2018-04-10 11:31:58 -06: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
Nicole Thomas	10e2771328	Merge pull request #46901 from cbosdo/purge_fix ... Purge fix	2018-04-10 13:06:23 -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