3433 Commits

Author	SHA1	Message	Date
Pedro Algarvio	410b583a63	The port attribute definition must come first	2017-03-12 18:05:30 +00:00
Pedro Algarvio	992a8c7294	Don't hardcode the webserver port number	2017-03-11 16:00:28 +00:00
Mike Place	bbf4eacbba	Merge pull request #39930 from s0undt3ch/features/py3 ... Moar Py3 and a fix for #38121	2017-03-09 17:25:01 -07:00
rallytime	e7fa367548	[develop] Fix pylint error	2017-03-09 13:04:51 -07:00
Pedro Algarvio	680bbec79f	The beacons configuration is now a list. Handle it!	2017-03-09 19:31:13 +00:00
Pedro Algarvio	dd53f055b9	Code cleanup and make sure the beacons config file is deleted after testing	2017-03-09 19:29:16 +00:00
Pedro Algarvio	42065350f1	Catch and handle tornado.iostream.StreamClosedError exceptions	2017-03-09 19:29:16 +00:00
Nicole Thomas	2f0f7cd224	Merge pull request #39897 from rallytime/merge-develop ... [develop] Merge forward from 2016.11 to develop	2017-03-09 09:03:46 -07:00
rallytime	c6cfac7678	Pylint fix	2017-03-08 16:24:03 -07:00
Pedro Algarvio	51c5558b32	This should no longer hang	2017-03-08 20:43:36 +00:00
Pedro Algarvio	0b41b92d7d	Use salt.utils.versions instead of distutils.version	2017-03-08 19:22:33 +00:00
Pedro Algarvio	06c063a609	Test assertion cannot be done in the callback context	2017-03-08 18:34:34 +00:00
Pedro Algarvio	b58241648a	Use the tests support paths module	2017-03-08 18:34:34 +00:00
Pedro Algarvio	7fffd93b50	Don't pollute the repo tests state tree	2017-03-08 18:34:33 +00:00
Pedro Algarvio	b391a4eb5b	Supervisord does not work under Python 3	2017-03-08 18:34:33 +00:00
Pedro Algarvio	e2e303e724	Minor changes to paths	2017-03-08 18:34:32 +00:00
Pedro Algarvio	712b81e0c1	supervisor does not run against py3. Use pep8 for the tests.	2017-03-08 18:34:32 +00:00
Pedro Algarvio	07d0a5ed20	Cleanup after ourselves	2017-03-08 18:34:32 +00:00
Pedro Algarvio	c436d9f2f6	This no longer applies.	2017-03-08 18:34:31 +00:00
rallytime	4fc9b5484b	Merge branch '2016.11' into 'develop' ... Conflicts: - salt/client/ssh/__init__.py - salt/pillar/makostack.py - tests/integration/client/test_runner.py - tests/integration/states/test_file.py	2017-03-08 09:04:26 -07:00
Pedro Algarvio	7dc6b64689	No need to call .keys() when iterating a dictionary	2017-03-06 14:42:31 +00:00
Pedro Algarvio	ffec7dc299	Lint fixes	2017-03-06 14:35:16 +00:00
Mike Place	3341e4e202	Merge pull request #39492 from whiteinge/full_return-arg ... Add full_return arg to LocalClient and RunnerClient	2017-03-04 09:14:17 -07:00
Mike Place	c10abec6d3	Merge pull request #39797 from twangboy/win_fix_test_git ... Fix test_worktree_add_rm test for Windows	2017-03-04 09:12:12 -07:00
Pedro Algarvio	adacf4cc28	Don't expect any ordering from sets!!!!!	2017-03-03 18:31:11 +00:00
twangboy	2a6e61a42e	Add encode for Py3 compatability	2017-03-03 10:53:12 -07:00
twangboy	54891a57b1	Fix type in second worktree_path	2017-03-03 10:24:28 -07:00
Pedro Algarvio	e180f1e913	Normalize the mode	2017-03-03 15:15:13 +00:00
twangboy	25938ebc8e	Fix test_add_user_to_group for Windows	2017-03-02 15:40:22 -07:00
twangboy	ef53ec7efe	Fix test_worktree_add_rm test for Windows	2017-03-02 14:37:53 -07:00
Pedro Algarvio	5b5a6ebbe8	Minor code cleanup	2017-03-02 19:58:10 +00:00
Pedro Algarvio	5e3309d5f8	Let's use the skip_if_not_root decorator instead	2017-03-02 19:58:10 +00:00
Pedro Algarvio	2f3d0b0b81	These are not destructive tests	2017-03-02 19:58:10 +00:00
Pedro Algarvio	80002276c2	These tests are not destructive	2017-03-02 19:58:10 +00:00
Pedro Algarvio	519a3f689e	These tests are not destructive	2017-03-02 19:56:06 +00:00
Pedro Algarvio	31df825a1c	Set the ssh_log_file relative	2017-03-02 19:56:06 +00:00
Pedro Algarvio	fc501e93ac	Remove deprecated options	2017-03-02 19:56:05 +00:00
Pedro Algarvio	7b4d849540	Moved some test supporting modules to tests/support ... Previously they were in tests/utils which also had test case modules.	2017-03-02 19:56:05 +00:00
Pedro Algarvio	979090d225	We need bytes under Py3 to compute the hash	2017-03-02 19:56:04 +00:00
Seth House	c25ffd5d2e	Add LocalClient and RunnerClient full_return tests	2017-03-02 11:46:27 -07:00
Mike Place	9f70ad7164	Merge pull request #39472 from whiteinge/_reformat_low-update ... Update _reformat_low to not run kwarg dicts through parse_input	2017-03-02 10:46:19 -07:00
Shane Lee	eb6d317289	Merge branch 'develop' into win_fix_renderers_tests	2017-03-02 10:29:36 -07:00
Mike Place	555f1473f6	Merge pull request #39788 from cachedout/disable_api_test ... Disable one API test that is flaky	2017-03-02 09:17:31 -07:00
Mike Place	523e377b33	Disable one API test that is flaky	2017-03-02 09:16:43 -07:00
twangboy	ad654abc20	Clarify the reason for the while loop	2017-03-01 14:00:06 -07:00
twangboy	25b6d221c4	Fix ext_grains and ext_modules tests for Windows	2017-03-01 14:00:06 -07:00
Mike Place	517842a339	Merge pull request #39696 from twangboy/win_fix_returners_tests ... Fix job cache tests, add librato return tests	2017-03-01 10:24:59 -07:00
Erik Johnson	64db0b8563	Add integration tests for remote file sources	2017-03-01 10:57:06 -06:00
Mike Place	33e40c94e4	Fix docs test for #39753	2017-03-01 09:06:17 -07:00
Pedro Algarvio	a78c037a5f	PyLint, no its not a repeated keyword!	2017-03-01 01:33:08 +00:00