101958 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tyler Johnson	90e8350612	Merge branch '2019.2.1' of https://github.com/saltstack/salt into gce_cloud_test	2019-08-12 12:21:02 -06:00
Daniel Wozniak	6fe6799825	Merge pull request #54180 from dwoz/keepalive_maxcount ... Point test-kitchen to my keepalive_maxcount branch	2019-08-12 11:18:25 -07:00
Tyler Johnson	60f8351864	Fixed failing Ec2 Tests	2019-08-12 12:15:16 -06:00
Tyler Johnson	e2f085ca59	removed py3-only function call	2019-08-12 11:17:43 -06:00
Tyler Johnson	4406c579dd	fixed lint errors, more descriptive fails	2019-08-12 10:47:08 -06:00
Daniel A. Wozniak	dc9ee215df	Add reminder about kitchen version	2019-08-12 15:57:22 +00:00
Daniel A. Wozniak	19a1f1bcfe	Point test-kitchen to my keepalive_maxcount branch	2019-08-11 23:31:04 +00:00
Tyler Johnson	6840d5f9e1	assert instances exist in unified way	2019-08-09 15:42:11 -06:00
Tyler Johnson	03da233c35	skip EOL joyent tests, secure delete instances	2019-08-09 13:37:30 -06:00
Tyler Johnson	3123bb1a10	Merge branch '2019.2.1' of https://github.com/saltstack/salt into gce_cloud_test	2019-08-09 13:03:20 -06:00
Daniel Wozniak	9f5302d94a	Merge pull request #54033 from twangboy/fix_win_service_2019.2.1 ... Backport #53311 to 2019.2.1	2019-08-09 09:46:35 -07:00
Daniel Wozniak	c0e49d9125	Merge pull request #53900 from twangboy/fix_lgpo ... Fix inconsistent full names in LGPO	2019-08-09 02:15:40 -07:00
Daniel Wozniak	9eb2938c47	Merge pull request #52818 from twangboy/add_watchdog ... Add watchdog as a bundled dependency on Windows	2019-08-08 21:26:53 -07:00
Daniel Wozniak	5bef520241	Merge pull request #54143 from Akm0d/openstack_fix ... Don't call potentially missing shade library (#53734)	2019-08-08 18:05:25 -07:00
Tyler Johnson	29ee7ceafd	removed print statements, optimized query	2019-08-08 18:19:36 -06:00
Tyler Johnson	14b75397f3	added back print statements for easy debug	2019-08-08 15:53:15 -06:00
Tyler Johnson	823b3b2a04	Removed print statements and broken re	2019-08-08 15:30:02 -06:00
Tyler Johnson	9696ed9e5e	experiment with sublcass names	2019-08-08 14:24:03 -06:00
Tyler Johnson	2fa6157d22	more verbose instance names based on test	2019-08-08 14:11:20 -06:00
Tyler Johnson	2acb2df6d3	undercased non-const variable and added print statements	2019-08-08 14:02:43 -06:00
Daniel Wozniak	2850fab993	Merge branch '2019.2.1' into fix_win_service_2019.2.1	2019-08-08 10:39:17 -07:00
Daniel Wozniak	e05abdf17d	Merge branch '2019.2.1' into fix_lgpo	2019-08-08 10:33:05 -07:00
Tyler Johnson	c5e875db4a	Merge branch '2019.2.1' of https://github.com/saltstack/salt into gce_cloud_test	2019-08-08 09:57:20 -06:00
Akmod	c9cb18ffe6	Don't call potentially missing shade library (#53734) ... * Check for openstack * Account for HAS_SHADE not being a tuple	2019-08-08 09:53:02 -06:00
Akmod	3f58885db7	Merge branch '2019.2.1' into openstack_fix	2019-08-08 09:48:11 -06:00
Daniel Wozniak	584e3f2460	Merge pull request #54001 from garethgreenaway/add_metaproxy_2019_2_1 ... [2019.2.1] Porting metaproxy changes in #50183 to 2019.2.1	2019-08-07 21:24:30 -07:00
Daniel Wozniak	bf863d0e00	Merge pull request #54136 from ScoreUnder/2019.2.1-patch-macos-cmd.run ... Fix cmd.run on MacOS (rebased)	2019-08-07 21:20:30 -07:00
Akmod	71f5f38deb	Don't call potentially missing shade library (#53734) ... * Check for openstack * Account for HAS_SHADE not being a tuple	2019-08-07 16:58:48 -06:00
Tyler Johnson	5ef8414781	Added more verbose logging to cloud tests	2019-08-07 16:18:37 -06:00
Tyler Johnson	2f3942f8e5	better logging and fail messages	2019-08-07 15:53:37 -06:00
Tyler Johnson	9454f4cad9	Fixed pylint errors and temporary print statements	2019-08-07 14:37:27 -06:00
Gareth J. Greenaway	83534671eb	Merge branch 'add_metaproxy_2019_2_1' of github.com:garethgreenaway/salt into add_metaproxy_2019_2_1	2019-08-07 13:36:29 -07:00
Gareth J. Greenaway	ab72e1b821	Adding unit.test_proxy_minion to ignore list	2019-08-07 13:35:49 -07:00
twangboy	2658634fa6	pre-commit	2019-08-07 11:32:23 -06:00
twangboy	35691f22bc	Add watchdog to Linux and OSX .in files	2019-08-07 11:32:21 -06:00
twangboy	5ef5969f76	Rremove opensuse 42 static files	2019-08-07 11:32:21 -06:00
twangboy	ec285d07a3	Remove watchdog from the rest of the .in files	2019-08-07 11:32:20 -06:00
twangboy	86e64ae115	Remove unused import, remove Windows reference	2019-08-07 11:32:19 -06:00
twangboy	b934d53189	Remove watchdog from windows.in	2019-08-07 11:32:19 -06:00
twangboy	cfaee96250	Fix and unify watchdog beacon tests for all OS's	2019-08-07 11:32:18 -06:00
twangboy	cc732040ba	Put Windows tests in their own class	2019-08-07 11:31:36 -06:00
Shane Lee	6fbf1a3196	Remove unused import... lint	2019-08-07 11:29:55 -06:00
twangboy	832a1db7b0	Fix windowsisms	2019-08-07 11:29:49 -06:00
Pedro Algarvio	4f47d500a9	Update static requirements	2019-08-07 09:58:44 -06:00
twangboy	762fe3bc77	Remove some fluff	2019-08-07 09:58:44 -06:00
twangboy	946076ce83	Add watchdog for tests	2019-08-07 09:58:44 -06:00
twangboy	02248dcd1a	Fix modified test to account for OS variances	2019-08-07 09:58:44 -06:00
twangboy	15ee4794c3	Compile static requirements	2019-08-07 09:58:43 -06:00
twangboy	78a5723bb3	Add watchdog to Linux and OSX .in files	2019-08-07 09:58:43 -06:00
twangboy	9a0f08a7f9	Update static requirements	2019-08-07 09:58:43 -06:00