80122 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Raymond Kuiper	04c94ff6d6	Merge branch 'develop' of github.com:q1x/salt into develop	2017-04-04 09:04:47 +02:00
Raymond Kuiper	d1bab9c6af	Added zabbix.mediatype_update	2017-04-03 17:04:33 +02:00
Raymond Kuiper	1a15bc9370	Added zabbix.mediatype_create	2017-04-03 16:18:59 +02:00
Raymond Kuiper	c4362bdc89	Added zabbix.mediatype_get and zabbix.mediatype_delete functions.	2017-04-03 15:40:58 +02:00
Raymond Kuiper	4c13f5e985	Removed whitespace because of lint errors.	2017-03-31 22:27:07 +02:00
Raymond Kuiper	7b1b266654	Removed a debug line	2017-03-31 13:35:09 +02:00
Raymond Kuiper	16ee66b996	Added the ability to manage Zabbix usergroup permissions in newer Zabbix versions.	2017-03-31 12:44:00 +02:00
Raymond Kuiper	3a686d6d92	Corrected comment typo	2017-03-30 08:06:18 +02:00
Raymond Kuiper	a679eee9c4	Corrected a small namingerror in the docstring	2017-03-29 18:44:06 +02:00
Pedro Algarvio	9322630126	Merge pull request #40138 from s0undt3ch/features/py3 ... Fix unit tests mocking	2017-03-28 22:34:32 +01:00
Nicole Thomas	e49693a7b1	Merge pull request #40367 from Ch3LL/bump_version_dev ... [develop] Bump previous version to 2016.3.6	2017-03-28 12:51:19 -06:00
Ch3LL	474c62328b	Bump previous version to 2016.3.6	2017-03-28 12:37:13 -06:00
Pedro Algarvio	5df3054f47	Add minimal documentation about LoaderModuleMockMixin	2017-03-28 19:04:05 +01:00
Pedro Algarvio	7dc11df8ef	Update existing tests documentation.	2017-03-28 19:04:05 +01:00
Pedro Algarvio	5bfe64a121	Fix and adapt the salt-extend templates to the LoaderModuleMockMixin	2017-03-28 19:04:05 +01:00
Pedro Algarvio	9383142dcc	The LoaderModuleMixin is the right approach here. ... This changes sys.modules instead of mock patching it effectively changing it while running tests. This should not happen.	2017-03-28 19:04:05 +01:00
Pedro Algarvio	4c17fad6b6	No need to use tests.unit.ModuleTestCase. Proper Mocking.	2017-03-28 19:04:04 +01:00
Pedro Algarvio	090041d674	Allow patching sys.modules with mocked modules	2017-03-28 19:04:04 +01:00
Pedro Algarvio	6dcf7552a7	Py3 fixes. Tests are not destructive.	2017-03-28 19:04:04 +01:00
Pedro Algarvio	d62a05c512	Extend the list, not append a list to a list	2017-03-28 19:04:04 +01:00
Pedro Algarvio	e95b7e062c	Proper mocking. Fix tests expectations. Runs on non windows too.	2017-03-28 19:04:03 +01:00
Pedro Algarvio	2b8d26b811	The develop branch no longer targets python 2.6	2017-03-28 19:04:03 +01:00
Pedro Algarvio	845cbabe97	Code cleanup. Proper mocking.	2017-03-28 19:04:03 +01:00
Pedro Algarvio	b7867e8e39	hashlib needs bytes in py3	2017-03-28 19:04:03 +01:00
Pedro Algarvio	8560d8a6d3	Proper mocking. Tests are not destructive.	2017-03-28 19:04:03 +01:00
Pedro Algarvio	2dc9e1cfd0	Proper mocking. Py3 Compat.	2017-03-28 19:04:02 +01:00
Pedro Algarvio	4baabcfb1e	Proper mocking. Some additional mocking and fixes.	2017-03-28 19:04:02 +01:00
Pedro Algarvio	42b6c3a030	ctypes is not a windows specific module	2017-03-28 19:04:02 +01:00
Pedro Algarvio	5e8764ef78	Return lists in py2 and py3 instead of dict_keys() in py3	2017-03-28 19:04:02 +01:00
Pedro Algarvio	da5ee155d1	Proper mocking. If this fails @twangboy, let me known.	2017-03-28 19:04:02 +01:00
Pedro Algarvio	99bc71dc4e	Proper mocking.	2017-03-28 19:04:01 +01:00
Pedro Algarvio	14db38979c	Proper mocking. Py3 Compat.	2017-03-28 19:04:01 +01:00
Pedro Algarvio	5d79bdb642	Python 3 compat	2017-03-28 19:04:01 +01:00
Pedro Algarvio	d397763553	Adjust to the new LoaderModuleMockMixin usage	2017-03-28 19:03:59 +01:00
Pedro Algarvio	7c9460b719	Reduce complexity while still allowing multiple loader modules to be mocked ... This also goes in par with the effort to reduce memory usage since we no longer have any class attributes attached to the test classes.	2017-03-28 19:02:51 +01:00
Pedro Algarvio	608402359f	Proper mocking. Windows compat.	2017-03-28 19:02:51 +01:00
Pedro Algarvio	e7768705f9	Allow passing different loader_module_globals per loader_module	2017-03-28 19:02:51 +01:00
Pedro Algarvio	93ad2cc428	Proper mocking. Code is mocked! Runs on non windows too.	2017-03-28 19:02:51 +01:00
Pedro Algarvio	5c13f7b2bb	Proper mocking.	2017-03-28 19:02:50 +01:00
Pedro Algarvio	cb532fb9ef	Code cleanup. Proper mocking.	2017-03-28 19:02:50 +01:00
Pedro Algarvio	f23596cbd1	Proper mocking. Py3 Compat.	2017-03-28 19:02:50 +01:00
Pedro Algarvio	9b1e55aa85	Import the full module namespace to avoid import shadowing. ... https://github.com/saltstack/salt/pull/39996#issuecomment-287857698	2017-03-28 19:02:47 +01:00
Pedro Algarvio	ff8cb0455f	Account for a timeout when resolving the future	2017-03-28 19:00:54 +01:00
Pedro Algarvio	f2b51cc22f	Always decode the response body to unicode	2017-03-28 19:00:53 +01:00
Pedro Algarvio	276f2dbb5f	More salt.loader import fixes	2017-03-28 19:00:53 +01:00
Pedro Algarvio	8325a58a35	Proper mocking but I'm lost as to what is actually being tests here	2017-03-28 19:00:53 +01:00
Pedro Algarvio	eaddf737f3	Add missing import and solve cycle import error.	2017-03-28 19:00:53 +01:00
Pedro Algarvio	a894eebf31	Code cleanup. Proper mocking!!!	2017-03-28 19:00:53 +01:00
Pedro Algarvio	5216ff0932	Code cleanup. Proper mocking	2017-03-28 19:00:52 +01:00
Pedro Algarvio	278275cf37	Fix StringVersion and LooseVersion. Add unit tests.	2017-03-28 19:00:52 +01:00