10128 Commits

Author	SHA1	Message	Date
Erik Johnson	f13ddeb394	Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7 ... Conflicts: - doc/_themes/saltstack2/layout.html - salt/auth/__init__.py - salt/utils/schedule.py	2017-06-28 20:27:32 -05:00
Erik Johnson	fb6a93314f	Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips ... The IP for saltstack.com changed, so this test needs to be updated.	2017-06-28 19:42:52 -05:00
rallytime	9cb9547bc0	Rename transport_test file to test_transport and update imports for pytest	2017-06-28 11:35:13 -06:00
rallytime	7d7be2d375	Merge branch '2016.11' into '2017.7' ... Conflicts: - doc/ref/configuration/master.rst - tests/integration/states/test_archive.py - tests/unit/transport/test_tcp.py - tests/unit/transport/test_zeromq.py	2017-06-28 10:48:37 -06:00
garethgreenaway	4fe273f78e	Merge pull request #41969 from twangboy/win_unit_test_config ... Fix `unit.config.test_config` for Windows	2017-06-28 08:18:07 -07:00
garethgreenaway	7c96200e42	Merge pull request #41967 from twangboy/win_unit_test_api ... Fix `unit.config.test_api` for Windows	2017-06-28 08:17:21 -07:00
twangboy	98bc208db9	Fix paths, skip impossible	2017-06-27 17:31:23 -06:00
twangboy	1f497d8f78	Fix paths	2017-06-27 16:43:54 -06:00
twangboy	3eca45e000	Fix unit tests for ssh	2017-06-27 15:29:44 -06:00
Mike Place	4209be843d	Merge pull request #41959 from DSRCorporation/bugs/minor_dict_diff_enhance ... Minor dict diff enhance in tests.	2017-06-27 15:18:16 -05:00
Mike Place	f9965ccfcb	Merge pull request #41939 from cachedout/mdadm_py3_test ... Gate assert check behind mock ver	2017-06-27 13:04:23 -05:00
Mike Place	e3bfd5a593	Merge pull request #41952 from meaksh/2017.7-suse-leftovers-part-two ... Fix "zypp_plugins" unit test for Python 3	2017-06-27 12:42:00 -05:00
Dmitry Kuzmenko	e01e566779	Minor: show full dict diffs if test fails.	2017-06-27 16:22:09 +03:00
Pablo Suárez Hernández	7affbce83a	Fix zypp_plugins unit test for Python 3	2017-06-27 09:26:35 +01:00
Mike Place	1c74b8909e	Merge pull request #41942 from terminalmage/add-maxdiff ... Add maxDiff to pyobjects test for troubleshooting	2017-06-26 13:01:30 -05:00
Mike Place	e28e10ded2	Merge pull request #41914 from vutny/fix-archive-extracted-local-file-hash ... archive.extracted: fix hash sum verification for local archives	2017-06-26 12:59:27 -05:00
Erik Johnson	3fac9b3b06	Add maxDiff to pyobjects test for troubleshooting	2017-06-26 12:58:49 -05:00
Mike Place	41c65b0e2c	Gate assert check behind mock ver	2017-06-26 11:04:49 -06:00
Denys Havrysh	54910fe55f	archive.extracted: fix hash sum verification for local archives	2017-06-26 19:08:47 +03:00
Mike Place	ff67d47a2e	Merge pull request #41516 from kstreee/fix-blocking-waiting-tcp-connection ... Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications.	2017-06-26 09:41:38 -05:00
kstreee	df96969959	Removes redundant closing statements.	2017-06-26 04:58:24 +00:00
Ch3LL	9a4b3dbaba	Fix some formatting	2017-06-23 18:46:25 -04:00
Ch3LL	73271ce94d	Add vmware test to check new disk on seperate datastore	2017-06-23 18:36:50 -04:00
Mike Place	eb2bf865b8	Merge branch '2016_11_to_7' of github.com:cachedout/salt into 2016_11_to_7	2017-06-23 10:51:04 -06:00
Erik Johnson	61870075aa	Add building_highstate odict to mock HighState class	2017-06-23 11:48:00 -05:00
Mike Place	bee68beb8e	Lint fix	2017-06-23 10:18:06 -06:00
Mike Place	00746cafce	Lint fix for win_certutil	2017-06-23 10:11:48 -06:00
Mike Place	8647086de8	Merge branch '2016_11_to_7' of github.com:cachedout/salt into 2016_11_to_7	2017-06-22 15:39:38 -06:00
Mike Place	048befb5fe	Fix lint	2017-06-22 15:36:21 -06:00
Erik Johnson	2ee43fc743	Fix default opts handling ... Starting in 2017.7 the dunder dicts are handled differently in unit tests.	2017-06-22 13:40:40 -05:00
Mike Place	7697d0d1d2	Remove merge conflict line	2017-06-22 12:35:28 -06:00
Mike Place	80cb57e02b	Fix win_certutil merge error	2017-06-22 11:40:56 -06:00
Mike Place	481797b147	Merge branch '2016.11' into '2017.7'	2017-06-21 15:49:39 -06:00
Mike Place	6e9e0714f0	Merge forward from 2016.11 to 2017	2017-06-21 14:51:02 -06:00
garethgreenaway	4a326444fe	Merge pull request #41882 from Ch3LL/fix_crypt_test ... Add pycryptodome to crypt_test	2017-06-21 12:51:09 -07:00
Ch3LL	6f70dbd0e1	Add pycryptodome to crypt_test	2017-06-21 13:41:12 -04:00
Mike Place	a25818b90b	Merge pull request #41872 from DSRCorporation/bugs/py3_DiskTestCase ... Py3: test_disk fix: don't expect dict iteration order will be the same	2017-06-21 12:09:57 -05:00
Mike Place	eea9cafba0	Merge pull request #41874 from DSRCorporation/bugs/py3_mdadm_test ... Py3 mdadm test	2017-06-21 12:03:33 -05:00
Mike Place	13df29ed9b	Merge pull request #41877 from Ch3LL/fix_netstat_test ... Fix netstat and routes test	2017-06-21 11:16:58 -05:00
Mike Place	66f8c83c93	Merge pull request #41566 from morganwillcock/certutil ... win_certutil: workaround for reading serial numbers with non-English languages	2017-06-21 10:40:28 -05:00
Mike Place	ccd81ed047	Merge pull request #41859 from DSRCorporation/bugs/py3_tests_2017.7 ... Py3 etcd unit test fix.	2017-06-21 10:33:15 -05:00
Mike Place	4d0f5c433d	Merge pull request #41679 from terminalmage/get-top-file-envs ... Prevent unnecessary duplicate pillar compilation	2017-06-21 10:32:42 -05:00
Mike Place	278b5614d0	Merge pull request #41856 from meaksh/2017.7-suse-leftovers-part-two ... SUSE leftovers for 2017.7.0 RC	2017-06-21 10:24:37 -05:00
Dmitry Kuzmenko	e1e8d96ef2	Removed unneeded import.	2017-06-21 18:08:44 +03:00
Ch3LL	d2076a6c93	Patch salt.utils.which for test_route test	2017-06-21 10:55:01 -04:00
Ch3LL	51f7e107dc	Patch salt.utils.which for test_netstat test	2017-06-21 10:50:03 -04:00
Erik Johnson	a916e8da49	Improve normalization of saltenv/pillarenv usage for states	2017-06-21 08:49:34 -05:00
Erik Johnson	02f293a19c	Update state unit tests to reflect recent changes	2017-06-21 08:19:05 -05:00
Dmitry Kuzmenko	1401b2d5ba	Py3: mdadm test fix: don't expect kwargs iteration order	2017-06-21 15:45:55 +03:00
Dmitry Kuzmenko	127e48025a	Py3: tests_disk fix: don't expect dict iteration order will be the same	2017-06-21 14:48:59 +03:00