18081 commits

Author	SHA1	Message	Date
Blacken Salt	0b2a5613b3	Blacken salt	2020-04-03 13:05:41 -05:00
Daniel Wozniak	55655ff96c	Merge branch 'master' into pip_custom_pypi	2020-03-24 09:42:57 -07:00
ch3ll	86fe450c82	Fix #56433 - test_pip_installed_specific_env	2020-03-23 17:18:14 -04:00
ch3ll	85d7c784ef	Fix integration setup egg test	2020-03-20 11:27:40 -04:00
ch3ll	a8a22a4040	Ensure version.py included before we install	2020-03-19 17:23:42 -04:00
ch3ll	22cccd2107	Use virtualenv test helper that already exists and fix setup.py	2020-03-16 15:33:43 -04:00
ch3ll	293b1fddf2	cleanup code	2020-03-16 13:52:48 -04:00
ch3ll	ddfb065bfb	add bdist_wheel test	2020-03-16 13:52:48 -04:00
ch3ll	fceff0287c	ensure name is included in new version	2020-03-16 13:52:48 -04:00
ch3ll	0cbf6d3246	Ensure SaltStackVersion attributes in _version.py correct	2020-03-16 13:52:48 -04:00
Daniel Wozniak	fcee692c4a	Merge pull request #55822 from cmcmarrow/win_task_repeat ... fix_Indefinitely_code	2020-03-16 10:34:09 -07:00
Daniel Wozniak	a660e96fb2	Merge pull request #56360 from Ch3LL/mac_virtual ... Use virtualenv 20.0.10 for macosx tests	2020-03-13 09:39:56 -07:00
Daniel Wozniak	d8fc07274c	Merge pull request #56327 from mchugh19/56324 ... keep cache_copied_files variable a list	2020-03-13 09:39:31 -07:00
Daniel Wozniak	2d31d61ab9	Merge pull request #56023 from cmcmarrow/binary_fix_pip_bin_env ... add fix for bin_env	2020-03-13 09:39:08 -07:00
Charles McMarrow	e257fb2804	Merge branch 'master' into win_task_repeat	2020-03-13 09:53:05 -06:00
Megan Wilhite	e1e2df2b1d	Merge branch 'master' into 56324	2020-03-12 17:37:33 -04:00
ch3ll	dca3390c0c	skip zcbuildout state test when virtualenv 20.0.0	2020-03-12 10:57:07 -04:00
ch3ll	fdeae1f0e1	Use virtualenv 20.0.10 for macosx tests	2020-03-12 10:54:13 -04:00
Charles McMarrow	f780fd013e	Merge branch 'master' into binary_fix_pip_bin_env	2020-03-11 16:41:51 -06:00
twangboy	4bc5b05586	Fix some lint	2020-03-11 16:12:13 -06:00
twangboy	ce282f9754	Mark destructive test	2020-03-11 16:11:09 -06:00
twangboy	8af09c31ca	Add test case	2020-03-11 16:11:09 -06:00
Daniel Wozniak	2d78931eaf	Merge pull request #56272 from twangboy/fix_lgpo_names ... Properly resolve the policy name	2020-03-11 15:11:01 -07:00
Daniel Wozniak	c6c6e2e3d9	Merge pull request #56358 from s0undt3ch/hotfix/version-parsing ... Fix version instantiation when minor is an empty string	2020-03-11 15:10:03 -07:00
Daniel Wozniak	b33047c574	Merge pull request #56160 from twangboy/fix_reg_dword ... Fix issue with existing reg_dword entries	2020-03-11 15:09:20 -07:00
Daniel Wozniak	8f23706871	Merge pull request #56337 from twangboy/fix_win_network_type ... Handle Adapter Type 53 and Undefined Types	2020-03-11 15:08:18 -07:00
Daniel Wozniak	e551ff6a31	Merge pull request #56060 from twangboy/fix_lgpo_regex ... Fix regex string for **Del and **DelVals	2020-03-11 15:05:37 -07:00
Daniel Wozniak	c9bc9431c1	Merge pull request #56215 from dwoz/issue-56131 ... Fix for unless requisite when pip is not installed	2020-03-11 15:04:28 -07:00
Daniel Wozniak	74b67ea741	Merge pull request #56339 from twangboy/fix_win_dns_client ... Fix win_dns_client when used with scheduler	2020-03-11 15:01:31 -07:00
twangboy	a7369e41d7	Remove redundent code... some more	2020-03-11 13:18:14 -06:00
twangboy	1db3052b94	Consolidate duplicate code	2020-03-11 13:18:14 -06:00
twangboy	b25b56299d	Fix failing PY2 tests	2020-03-11 13:18:14 -06:00
twangboy	36a24ac28f	Only load adml data once	2020-03-11 13:18:14 -06:00
twangboy	bc13be6850	Add some tests	2020-03-11 13:18:13 -06:00
twangboy	d6a4fbe85d	Fix bad test (lint)	2020-03-11 13:14:08 -06:00
Pedro Algarvio	cb22e78502	Fix version instantiation when minor is an empty string	2020-03-11 19:09:16 +00:00
Daniel Wozniak	7701e8762d	Merge pull request #56290 from lorengordon/pop-secdata ... Ensures popping lgpo.secedit_data does not throw KeyError	2020-03-11 10:27:03 -07:00
Wayne Werner	18a31a0b22	Merge branch 'master' into fix_win_network_type	2020-03-11 11:08:10 -06:00
Daniel Wozniak	84c60708cd	Merge pull request #56341 from dwoz/issue-56119 ... Revert "Don't remove one directory level from slspath"	2020-03-11 10:03:32 -07:00
Daniel A. Wozniak	5dd8f8eabe	Fix linter	2020-03-11 16:48:45 +00:00
twangboy	ca260ef582	Use byte-strings in the test	2020-03-11 10:12:30 -06:00
twangboy	7c81874a5b	Add some tests	2020-03-11 10:12:30 -06:00
twangboy	80650c2a8c	Make test more explicit	2020-03-11 10:11:10 -06:00
twangboy	67dd1c18c7	Fix issue with existing reg_dword entries ... When passing an invalid reg_dword type in the state file, such as '000001', the registry code casts it to the proper type. In the case of '000001' it would be case to an integer `11. This conversion was happening after the comparison to see if changes were to be made, thus comparing '000001' to the existing integer `1`. This PR moves the casting of the state file data before the comparison so that it is comparing proper types. Also fixes some issues with the comments being returned by the state file where it was returning incorrect duplicate strings. `<key name> added to <key name>`. Now it returns `<key value> name added to <key name>` Added tests for the integer comparison. Fixed tests for the new comments	2020-03-11 10:11:09 -06:00
twangboy	47bd67373f	Add some tests	2020-03-11 09:58:40 -06:00
twangboy	995975649a	Add missing import, improve docs	2020-03-11 09:58:40 -06:00
Megan Wilhite	62453bb6ce	Merge branch 'master' into pop-secdata	2020-03-11 09:37:56 -04:00
Christian McHugh	6d7572706d	use includes for saltcheck integration test	2020-03-11 06:56:17 +00:00
Daniel Wozniak	65b3f4c9a0	Merge branch 'master' into issue56167	2020-03-10 17:37:48 -07:00
Daniel Wozniak	d92914ad91	Merge branch 'master' into fix_win_network_type	2020-03-10 17:09:19 -07:00