15209 Commits

Author	SHA1	Message	Date
Daniel A. Wozniak	a5dffb9efe	Increase and standardize ShellCase timeouts	2018-12-18 12:51:06 -07:00
Daniel Wozniak	65e7d3bc8d	Merge pull request #50746 from dwoz/macostestprog ... Fix exit status tests on osx	2018-12-06 08:39:56 -07:00
Gareth J. Greenaway	1b4d398579	Merge branch '2018.3' into fluorine ... Conflicts: salt/modules/acme.py	2018-12-05 21:54:14 +01:00
Daniel A. Wozniak	6d07cb4af7	Fix exit status tests on osx	2018-12-04 10:44:50 -07:00
Daniel A. Wozniak	c53c046edf	Older MacOS versions won't have TMPDIR environment	2018-12-04 09:16:48 -07:00
Gareth J. Greenaway	fde8db5ef4	Merge branch '2017.7' into merge-2017.7 ... Conflicts: tests/support/case.py	2018-12-04 15:53:04 +01:00
Daniel Wozniak	246c055676	Merge pull request #50718 from dwoz/run_run_timeout ... Honor run_run timeout for shell tests	2018-12-03 09:00:23 -07:00
Daniel Wozniak	d9c5f57437	Merge pull request #50719 from dwoz/orchestrate_subset ... Increase timeout on orchestrate subset test	2018-12-03 09:00:07 -07:00
Daniel A. Wozniak	6118bdffe0	Fix spacing	2018-12-02 15:40:09 -07:00
Daniel A. Wozniak	ff76255017	Increase timeout on orchestrate subset test	2018-12-02 15:34:16 -07:00
Daniel A. Wozniak	ba7c8ab1da	Honor run_run timeout for shell tests	2018-12-02 15:30:11 -07:00
Daniel A. Wozniak	ecd84863cd	Honor run_run timeout for shell tests	2018-12-02 15:21:17 -07:00
Daniel Wozniak	6b0f8d9c79	Merge pull request #50717 from dwoz/kub_darwin ... Fix temp directory location on MacOS	2018-12-01 16:58:58 -07:00
Gareth J. Greenaway	4014d7251d	Merge pull request #50713 from dwoz/jinja_test ... Fix failing jinja filter test	2018-12-01 15:37:49 -08:00
Daniel A. Wozniak	68e094d379	Fix temp directory locaiton on MacOS	2018-12-01 16:02:17 -07:00
Daniel A. Wozniak	b1c5ffbabc	Skip xen test when not linux	2018-12-01 15:41:10 -07:00
Daniel A. Wozniak	7a2cbbf659	Fix failing jinja filter test	2018-11-30 23:15:59 -07:00
Mike Place	edaa9fed03	Merge pull request #50685 from Ch3LL/merge_2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-11-30 11:46:06 -07:00
Mike Place	1b4938e274	Merge pull request #50686 from Ch3LL/merge_fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-11-30 11:45:34 -07:00
Gareth J. Greenaway	afef38bc6f	Fixing unit.modules.test_x509 for Py3.	2018-11-29 14:47:50 -08:00
Ch3LL	49368667e5	Merge branch 2018.3 into fluorine ... Conflicts: - salt/returners/__init__.py	2018-11-29 13:27:26 -05:00
Ch3LL	d46aff05fc	Merge branch 2017.7 into 2018.3 ... Conflicts: - salt/modules/file.py	2018-11-29 13:09:15 -05:00
Mike Place	a5c7639ecb	Merge pull request #50657 from terminalmage/issue49392 ... Rewrite host.present state to allow for removal of entries not matching IP	2018-11-29 10:58:39 -07:00
Gareth J. Greenaway	6b73c7637f	When using file.replace, with the search_only option, if the pattern does not exist in the file then we should return False.	2018-11-28 09:47:24 -08:00
Erik Johnson	e4946f9cec	Rename "remove" argument to "clean"	2018-11-28 11:41:48 -06:00
Gareth J. Greenaway	0ec8bcfd2f	When using the gem installed state, when passing a version that includes greater than or less than symbols, ensure that the installed versions meets that requirement.	2018-11-27 14:02:24 -08:00
Erik Johnson	7fd3bcea47	Add remove parameter to host.present state	2018-11-27 15:13:29 -06:00
Erik Johnson	2671a30671	Add unit tests for host.present state	2018-11-27 15:13:29 -06:00
twangboy	c4cb729257	Fix path issues with the tests	2018-11-27 12:49:27 -07:00
Gareth J. Greenaway	40833ac774	Updating test_maxrunning for Fluorine.	2018-11-26 12:26:20 -08:00
Gareth J. Greenaway	fced78bfa7	lint	2018-11-26 11:47:56 -08:00
Gareth J. Greenaway	0f15796484	Merge branch '2018.3' into merge-2018.3 ... Conflicts: salt/utils/schedule.py	2018-11-26 11:43:51 -08:00
Gareth J. Greenaway	45a1aa3bdc	Merge branch '2017.7' into merge-2017 ... Conflicts: tests/unit/transport/test_zeromq.py	2018-11-26 11:37:07 -08:00
Mike Place	5b7ab35dca	Merge pull request #50130 from garethgreenaway/49957_master_schedule_ignoring_maxrunning ... [2018.3] Fixes to schedule maxrunning on master	2018-11-26 13:35:34 -05:00
Gareth J. Greenaway	ac5e59e7bb	Merge branch 'fluorine' into merge-fluorine	2018-11-26 09:03:19 -08:00
Gareth J. Greenaway	96742aed42	Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host	2018-11-23 17:14:17 -08:00
Gareth J. Greenaway	2f6dac917b	Updating test_maxrunning_master to Mock get_running_jobs.	2018-11-23 17:07:16 -08:00
Gareth J. Greenaway	4bd0406e8d	Adding integration.scheduler.test_maxrunning to ignore list.	2018-11-23 17:07:16 -08:00
Gareth J. Greenaway	45e160d8fe	Adding integration.scheduler.test_maxrunning to filename_map.yml	2018-11-23 17:07:16 -08:00
Gareth J. Greenaway	44940d6c23	Ensure minion tests using minion options.	2018-11-23 17:07:16 -08:00
Gareth J. Greenaway	722be433c2	Fixing lint	2018-11-23 17:07:16 -08:00
Gareth J. Greenaway	65b44214d4	Adding some master specific functions to uitls/masters.py to determine if a Salt process is running. Updating utils/schedule.py to use the appropriate running function either from utils/master.py or utils/minion.py depending on where the scheduled job is running. Adding tests to test maxrunning in scheduled jobs for both the minion and master.	2018-11-23 17:07:16 -08:00
Daniel A. Wozniak	a289e3cd55	Merge branch '2017.7' into zmqpubserv	2018-11-22 17:33:02 -07:00
Gareth J. Greenaway	9f422b2a06	Moving the minion_blackout code to the start of the try...except. Adding a test to ensure we get a log.exception when minion_blackout is True.	2018-11-21 14:29:45 -08:00
Gareth J. Greenaway	eb510a6675	Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host	2018-11-21 08:51:09 -08:00
Erik Johnson	c312b57712	Remove no-longer-existant test module from whitelist.txt ... This was converted to unit tests in #50528. Since there are no unit tests in the whitelist.txt, I've removed it rather than renaming.	2018-11-21 08:35:18 -06:00
Erik Johnson	678a75b2a1	Merge remote-tracking branch 'upstream/2018.3' into fluorine	2018-11-21 07:31:51 -06:00
Daniel Wozniak	60b4622570	Merge pull request #50366 from jdsieci/2018.3-fix-issue50254 ... 2018.3 fix issue50254	2018-11-20 13:31:29 -07:00
Gareth J. Greenaway	6d2309da50	Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host	2018-11-20 08:44:05 -08:00
Gareth J. Greenaway	3661ee071a	Adding test=True to artifactory.download.	2018-11-19 16:42:11 -08:00