11329 Commits

Author	SHA1	Message	Date
Nicole Thomas	6889befc6b	Merge branch '2017.7' into solaris_product_grains	2018-05-25 09:57:40 -04:00
Ch3LL	7848114d6a	Add win_dns module integration tests for windows	2018-05-24 14:11:27 -04:00
Nicole Thomas	e1786de6b0	Merge branch '2017.7' into win_state_pkg	2018-05-24 13:36:53 -04:00
Nicole Thomas	cffc9b7806	Merge branch '2017.7' into fix_46981	2018-05-24 12:52:59 -04:00
Nicole Thomas	0ca5224cbf	Merge branch '2017.7' into winuser	2018-05-24 12:08:35 -04:00
Ch3LL	788abf771e	Add user state integration tests to windows	2018-05-24 11:46:02 -04:00
Ch3LL	2509d36888	Add windows to service disable ERROR check in tests	2018-05-24 08:30:17 -04:00
Daniel A. Wozniak	e5948902af	Use salt utils method for this_user	2018-05-24 00:40:20 -07:00
Daniel A. Wozniak	a056a293f1	Centeralize test username lookup	2018-05-23 16:16:35 -07:00
Daniel A Wozniak	6a6ab69722	Get the current username on windows	2018-05-23 16:16:32 -07:00
Nicole Thomas	2cb6634c6b	Merge pull request #47773 from frogunder/45011 ... add win_servermanager.list_available test	2018-05-23 15:44:13 -04:00
Nicole Thomas	e65dece202	Merge pull request #47807 from dwoz/winrmtests ... Try an even bigger timeout	2018-05-23 15:38:20 -04:00
Daniel A. Wozniak	1f1cc1357a	Increase instance size for cloud tests	2018-05-23 12:35:57 -07:00
Daniel A. Wozniak	be8dcd21f1	Try an even bigger timeout	2018-05-23 11:08:14 -07:00
Nicole Thomas	0e87559ee3	Merge pull request #47781 from rallytime/update-linode-sizes ... Update cloud test profile and docs to use new Linode size lables	2018-05-23 09:09:12 -04:00
Nicole Thomas	3ddc56cb9b	Merge pull request #47748 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.6 to 2017.7	2018-05-22 16:53:01 -04:00
Daniel A. Wozniak	d5eafe9d53	Use common timeout variable	2018-05-22 13:27:26 -07:00
rallytime	a90c1b760e	Update cloud test profile and docs to use new Linode size lables ... Linode changed their size labels recently, so the cloud test profile and the docs need to be updated accordingly. The new sizes can be found by running `salt-cloud --list-sizes <my-linode-config>`. For example, the `Linode 2048` size is now `Linode 2GB`.	2018-05-22 16:00:39 -04:00
Daniel A. Wozniak	7e948eb540	Increase ec2 cloud timeouts to 1000	2018-05-22 12:23:31 -07:00
Ch3LL	f8c467d3e6	Fix text editor error	2018-05-22 15:19:51 -04:00
Ch3LL	872e162137	Add test_pkg integration state tests to windows	2018-05-22 15:11:14 -04:00
rallytime	17596f3025	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-22 11:26:44 -04:00
Frode Gundersen	7c9b0bda33	add win_servermanager.list_available test	2018-05-22 14:43:11 +00:00
Daniel Wallace	3fdfc0fa82	skip test that breaks test suite	2018-05-21 17:42:35 -05:00
Daniel A. Wozniak	57dd89e6c3	Default to ec2 classic compatible images	2018-05-21 15:01:27 -07:00
Daniel A. Wozniak	f89668920a	Be explicit about winrm setting	2018-05-21 14:29:17 -07:00
Nicole Thomas	f45a96ba1d	Merge pull request #47668 from Ch3LL/win_pkg_test ... Add pkg.latest_version windows test	2018-05-21 16:26:44 -04:00
Daniel A. Wozniak	63b722ba21	Allow ssh_interface to default to public_ips	2018-05-21 09:30:45 -07:00
Daniel A. Wozniak	e88833a07d	Cloud test fixup ... - Increase winrm timeout - Ignore winrm tests when dependencies are missing	2018-05-20 01:24:03 -07:00
Nicole Thomas	00a13761c7	Merge pull request #47682 from terminalmage/issue47182 ... Fix traceback when excludes are present in an included SLS file	2018-05-18 12:47:46 -04:00
Daniel A. Wozniak	6e5cb36839	Default windows to m1.small for ec2-classic	2018-05-18 09:21:33 -04:00
Nicole Thomas	cad062eaa7	Merge pull request #47681 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.6 to 2017.7	2018-05-17 17:30:01 -04:00
Nicole Thomas	fd2d45d9c2	Merge pull request #47683 from Ch3LL/mac_user_test ... Remove unnecessary setUp in states.test_user test for mac	2018-05-17 17:28:25 -04:00
lomeroe	49053bc106	lint fix	2018-05-17 13:56:24 -05:00
lomeroe	6f185c9179	another lint fix	2018-05-17 12:20:49 -05:00
lomeroe	dbffba6876	fix tons of errors in my tests	2018-05-17 10:50:50 -05:00
lomeroe	8c9355d34c	Lint fix	2018-05-17 08:34:19 -05:00
Daniel A. Wozniak	20b6070d54	Default windows to m1.small for ec2-classic	2018-05-16 14:37:07 -07:00
lomeroe	b29ec75da7	Update regexes in core grains for detecting the 'product' grain on ... Solaris Sparc systems. Additionally, copy the 'product' grain to 'productname' to be consistent with other OSes.	2018-05-16 16:34:07 -05:00
twangboy	008af0ac6b	Fix unit tests	2018-05-16 15:13:41 -06:00
Erik Johnson	d0243e8f23	Suppress spurious lint failure ... This is failing because elsewhere in the test module the get_top() member function returns None, but this is done in a highstate attribute which is cleaned up in the tearDown and established as a fresh salt.state.HighState instance in the setUp.	2018-05-16 15:13:54 -05:00
Ch3LL	5a1b25b9c7	Remove unnecessary setUp in states.test_user test for mac	2018-05-16 13:54:19 -04:00
Erik Johnson	3b449f11fc	Add regression test for excludes issue	2018-05-16 12:26:46 -05:00
rallytime	6c06cb3ae3	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-16 12:46:26 -04:00
andrei	454291ad62	Fix errors when attempting to cache files with long names or URLs	2018-05-15 22:39:09 -05:00
Daniel Wallace	b0446aab07	Merge pull request #47670 from gtmanfred/2017.7 ... add a pytest.ini and update a dependency for kitchen	2018-05-15 20:56:16 -05:00
Daniel Wallace	dfd5a8715f	add a pytest.ini and update a dependency for kitchen	2018-05-15 20:55:18 -05:00
Daniel Wallace	0d06da6944	Merge pull request #47626 from gtmanfred/2017.7 ... Implement Pipfile and remove extra requirements.txt files	2018-05-15 19:03:11 -05:00
Ch3LL	a8981024de	Add pkg.latest_version windows test	2018-05-15 16:20:55 -04:00
Ch3LL	ba40d3d1a1	Update test_mac_user_enable_auto_login to test both py2 and py3	2018-05-15 14:40:54 -04:00
Nicole Thomas	a07a8906a0	Merge pull request #47578 from Ch3LL/mac_service_disabled ... Ensure mac_service.disabled is correctly querying services	2018-05-15 14:26:36 -04:00
Nicole Thomas	a4921e86c9	Merge pull request #47645 from Ch3LL/py3_rm_pip ... query the pip path for test test_issue_2087_missing_pip	2018-05-15 13:16:10 -04:00
Ch3LL	6032a01f55	change disable check for upstart service on ubuntu14	2018-05-15 12:07:27 -04:00
Daniel A. Wozniak	9e1d1a5ef8	Fix typo	2018-05-14 15:49:36 -04:00
Daniel A. Wozniak	0109249c78	use ignore-undefined-variable	2018-05-14 15:49:20 -04:00
Daniel A. Wozniak	37caecb7f4	Ignore pylint WindowsError	2018-05-14 15:49:15 -04:00
Daniel A. Wozniak	c1135d90c7	Better doc string	2018-05-14 15:49:08 -04:00
Daniel A. Wozniak	e53d6b9ed9	Skip tests when we can not use runas	2018-05-14 15:49:02 -04:00
Ch3LL	225d90ad4c	query the pip path for test test_issue_2087_missing_pip	2018-05-14 15:45:37 -04:00
Nicole Thomas	db0eef3e8b	Merge pull request #47643 from dwoz/runas_detect ... Remove unwanted file	2018-05-14 13:53:56 -04:00
Daniel A. Wozniak	8c5e54b8b3	Fix typo	2018-05-14 10:30:04 -07:00
Daniel Wozniak	6dd3ab9f06	Merge pull request #47601 from dwoz/runas_detect ... Skip tests when we can not use runas	2018-05-14 08:26:35 -07:00
Daniel A. Wozniak	3235ac08cb	use ignore-undefined-variable	2018-05-14 08:26:01 -07:00
Daniel Wallace	e0f7cc1447	add proxy tests decorator to pytest conftest	2018-05-13 08:38:38 -04:00
Daniel A. Wozniak	58911d510a	Ignore pylint WindowsError	2018-05-11 01:37:12 -07:00
Nicole Thomas	8a7913ccc3	Merge pull request #47548 from Ch3LL/syslog ... Catch Sysloghandler errors when log file does not exist	2018-05-10 16:23:24 -04:00
Ch3LL	33b4cfbc5b	Change service assertion check for systemd platforms	2018-05-10 16:16:39 -04:00
Daniel A. Wozniak	17987d3c5a	Better doc string	2018-05-10 12:11:45 -07:00
Daniel A. Wozniak	a48ac26573	Skip tests when we can not use runas	2018-05-10 12:06:56 -07:00
Ch3LL	31f13a4197	sysloghander: check for 3.5.4 python version	2018-05-10 14:12:15 -04:00
Ch3LL	14896f9743	change codeauthor and class name	2018-05-09 17:48:59 -04:00
Ch3LL	502c5bdff5	Ensure mac_service.disabled is correctly querying services	2018-05-09 17:12:50 -04:00
Nicole Thomas	291d3d3bd8	Merge pull request #47540 from terminalmage/cmdmod-home-fix ... Fix corner case where runas user's HOME env value is incorrect	2018-05-08 16:31:39 -04:00
Ch3LL	a020352a03	Catch Sysloghandler errors when log file does not exist	2018-05-08 15:12:35 -04:00
Mike Place	7cc8d9d30a	Merge pull request #47524 from dwoz/whitelistlines ... Gracefully handle blank lines in whitelist.txt	2018-05-08 10:04:22 -05:00
Erik Johnson	e4b277f82e	Fix corner case where runas user's HOME env value is incorrect ... In the test suite, two of the failing `pip.installed` tests were failing because when we shelled out to get the user's environment, the `HOME` environment variable's value was incorrectly showing the root user's home dir. This change ensures that we use the correct value for the HOME environment variable when running a command as another user.	2018-05-08 08:42:02 -05:00
Daniel A. Wozniak	4aea7ca571	Update doc string	2018-05-07 14:41:20 -07:00
Daniel A. Wozniak	b3289e5a1c	Fix test file name	2018-05-07 14:40:15 -07:00
Daniel A. Wozniak	2605ff8712	Gracefully handle blank lines in whitelist.txt	2018-05-07 13:35:00 -07:00
Mike Place	068da8ad7d	Merge branch '2017.7' into skip_diskusage	2018-05-07 09:20:38 -05:00
Mike Place	50b9c4d79d	Merge pull request #47478 from terminalmage/rename-pip-state-test ... Rename pip state test modules to match naming convention	2018-05-07 08:13:12 -05:00
Daniel A Wozniak	c6697b9f16	Move kill process tree and re-use it	2018-05-06 09:44:55 -07:00
Daniel Wozniak	6a4d0380b1	Merge pull request #47493 from dwoz/win_run_timeout ... Add support for windows timeout to run_salt	2018-05-05 22:34:30 -07:00
Daniel A Wozniak	fec1233dc4	Add support for windows timeout to run_salt ... The run_salt function needs to support timeout on windows for the full test suite to run.	2018-05-05 15:10:14 -07:00
Erik Johnson	9f7a9ebebd	Rename pip state test modules to match naming convention ... This makes the naming match the naming convention used throughout the test suite and will make the changes in https://github.com/saltstack/salt/pull/47337 work better.	2018-05-04 15:03:44 -05:00
Daniel Wallace	1f91a85587	specify cache dir for pip install	2018-05-04 12:48:52 -05:00
Nicole Thomas	da9871d36b	Merge pull request #47196 from twangboy/fix_47024 ... Fix issues with pip	2018-05-04 10:23:03 -04:00
twangboy	14ee5537b9	Add @with_tempdir helper ... Fix two state tests Remove redundent tests	2018-05-02 12:17:36 -06:00
Mike Place	2f5fc4ecc5	Merge pull request #47399 from isbm/isbm-zeromq17-deprecationwarning-2017.7.2-v2 ... zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes	2018-05-02 10:11:15 -05:00
Nicole Thomas	b14e974b5f	Merge pull request #47343 from Ch3LL/win_srv_test ... Add additional service module integration tests and enable for windows	2018-05-02 09:39:45 -04:00
twangboy	6c3b5fa6fa	Fix typo	2018-05-01 16:28:48 -06:00
Shane Lee	f031710af2	Merge branch '2017.7' into fix_47024	2018-05-01 16:26:04 -06:00
twangboy	7c46d9d0d4	Fix integration.modules.test_pip ... Pass password as kwarg for runas on Windows Fix issues with pip 10 in unit.states.test_pip	2018-05-01 15:33:29 -06:00
kstreee@gmail.com	b8d37e0a1e	To add a test case for the syndic environment, copies the test case which was written by @mattp- that was already merged into develop branch, related pr is #46692.	2018-05-02 03:21:06 +09:00
kstreee	4627bad1fd	Realizes 'tgt' field into actual minions using ckminions to subscribe results of the minions before publishing a payload.	2018-05-02 02:20:56 +09:00
Ch3LL	1a7ffb4e0d	return error if diskusage not available	2018-05-01 13:11:23 -04:00
Ch3LL	2173b6f549	ensure we are enabling/disabling before test	2018-05-01 11:53:55 -04:00
Ch3LL	10bd63a976	Skip status.diskusage integration tests on macsox	2018-04-30 14:44:34 -04:00
Bo Maryniuk	296c589f4b	Use ZMQ switch utility in the integration tests	2018-04-30 16:06:05 +02:00
Daniel A. Wozniak	67745c1362	Older GitPython versions will not have close	2018-04-29 00:50:20 -07:00
Daniel Wozniak	a5367eaf63	Merge pull request #47388 from dwoz/test_pip_fix ... Fix missing import	2018-04-28 11:33:14 -07:00
Daniel A. Wozniak	eb26321e8b	Fix missing import	2018-04-28 10:29:30 -07:00
Daniel Wallace	9b59b991c2	Merge pull request #47380 from gtmanfred/2017.7 ... add io_loop handling to runtests engine	2018-04-28 12:25:28 -05:00
Daniel Wallace	37822c0cbb	Merge pull request #47384 from dwoz/test_pip_fix ... Fix py2 version of pip test	2018-04-28 10:13:28 -05:00
Daniel A. Wozniak	a37a9da1fb	Fix py2 version of pip test	2018-04-28 02:24:39 -07:00
Daniel A. Wozniak	1570708fac	Close the repo and fix multiple tests	2018-04-28 01:32:02 -07:00
Daniel Wallace	93d1445ec1	add io_loop handling to runtests engine	2018-04-27 18:51:51 -05:00
twangboy	22ac81df63	Fix integration.modules.test_pip ... Removes references to `no_chown`. It hasn't been in use since 2015.8 Removes usage of user in pip calls. The user is defined as the current user which is the default anyway and it's causing tests not to run in Windows because Windows requires a password Removes the pwd import since it is no longer needed	2018-04-27 15:15:34 -06:00
Nicole Thomas	31db8ca7ad	Merge pull request #47347 from dwoz/test_mysql_fix_again ... Proper fix for mysql tests	2018-04-27 13:27:52 -04:00
Daniel A. Wozniak	add78fb618	Fix linter warnings	2018-04-27 09:04:01 -07:00
Erik Johnson	37a13d8004	Update pip unit tests to reflect changes	2018-04-27 09:47:18 -05:00
Erik Johnson	7f86779be0	Lint fix	2018-04-27 09:18:53 -05:00
Nicole Thomas	aacd5cefe3	Merge pull request #47304 from cachedout/test_cli_timeout_arg ... Pass timeout to salt CLI for tests	2018-04-27 09:11:57 -04:00
Nicole Thomas	55534fb659	Merge pull request #47311 from Ch3LL/firewall_windows ... Add firewall execution modules tests for windows	2018-04-27 09:10:53 -04:00
Daniel A. Wozniak	2644cc7553	Fix linter nits	2018-04-27 01:22:39 -07:00
Daniel A. Wozniak	799c601184	Proper fix for mysql tests	2018-04-27 00:22:50 -07:00
Daniel A. Wozniak	94a70e847a	Ignore gitfs tests when symlinks not enabled	2018-04-26 23:51:28 -07:00
twangboy	3e6e524eca	Fix some tests``	2018-04-26 22:37:15 -06:00
Daniel Wozniak	dac04261b5	Merge pull request #47342 from dwoz/test_mysql_fix ... Fix mysql test cases	2018-04-26 17:50:52 -07:00
Daniel A. Wozniak	7496f4c5a8	Fix mysql test cases	2018-04-26 15:42:46 -07:00
Daniel Wozniak	e4779f3246	Merge pull request #47339 from dwoz/ssh_key_test_fix ... Use salt.utils.fopen for line ending consistancy	2018-04-26 15:39:55 -07:00
Ch3LL	d58be06751	Add additionatl service module integration tests and enable for windows	2018-04-26 18:13:20 -04:00
Daniel A. Wozniak	e37a93a1ca	Remove redundent close call	2018-04-26 13:47:11 -07:00
Daniel A. Wozniak	b2ae5889b7	Close the temporary file handle	2018-04-26 12:52:08 -07:00
Daniel A. Wozniak	9f7f83a975	Use salt.utils.fopen for line ending consistancy	2018-04-26 12:43:51 -07:00
Daniel A. Wozniak	dcb6a22c00	Remove un-needed string-escape	2018-04-26 11:28:25 -07:00
Nicole Thomas	a545e55543	Merge pull request #47281 from Ch3LL/system_test ... Add win_system integration module tests	2018-04-26 12:07:40 -04:00
Nicole Thomas	b64d930df0	Merge pull request #47283 from Ch3LL/ntp_test ... Add windows ntp integration module tests	2018-04-26 12:04:43 -04:00
Ch3LL	67beb1451c	Skip netstat test on macosx as its not supported	2018-04-25 16:44:28 -04:00
Ch3LL	4e16c18c16	Add firewall module windows tests to whitelist	2018-04-25 15:26:45 -04:00
Ch3LL	4b2fc4ec66	Add windows firewall execution modules integration tests	2018-04-25 15:25:55 -04:00
Nicole Thomas	44f19b2f94	Merge pull request #47113 from jfindlay/iptables_state ... Support proto for IPSec policy extension in iptables state	2018-04-25 14:01:18 -04:00
Nicole Thomas	b7a6206330	Merge pull request #47302 from Ch3LL/dead_code ... Remove unnecessary code from core grains and add test	2018-04-25 13:58:47 -04:00
Mike Place	85025af83c	Pass timeout to salt CLI for tests ... This should hopefully fix up the race condition in the long-running jobs test.	2018-04-25 11:04:59 -05:00
Nicole Thomas	0d9d55e013	Merge pull request #47106 from DSRCorporation/bugs/tornado50 ... Tornado50 compatibility fixes	2018-04-25 11:32:36 -04:00
Ch3LL	daa68b4877	Add virtual grains test for core grains	2018-04-25 11:03:35 -04:00
Ch3LL	ced7f86546	Add windows ntp integration module tests	2018-04-24 15:12:58 -04:00
Ch3LL	c9181a75a6	Add destructivetest decorator on tests	2018-04-24 14:44:15 -04:00
Ch3LL	0d0c8987fc	Add win_system integration module tests	2018-04-24 14:37:14 -04:00
Justin Findlay	8bd08012ee	modules,states.iptables support proto for policy ext	2018-04-23 12:33:47 -07:00
Benedikt Werner	0197c3e973	Fix pip test	2018-04-23 21:05:15 +02:00
Dmitry Kuzmenko	39e403b18d	Merge branch '2017.7' into bugs/tornado50	2018-04-23 14:16:48 +03:00
Benedikt Werner	34bf66c09f	Fix pip.installed with pip>=10.0.0	2018-04-21 13:08:08 +02:00
Daniel A. Wozniak	ad9c7f63f0	Fix coverate on py3 windows builds ... Setting a value for will cause coverage to look for a config file called named '1' and in-turn raises an Exception. Based on the docs, if the environment variable exists coverage is enabled. Just defined the environment variable instead of giving it a value.	2018-04-20 12:30:43 -07:00
Pedro Algarvio	6706b3a2d1	Run off of a temporary config	2018-04-20 17:02:52 +01:00
Pedro Algarvio	d6873800d5	Allow running pytest>=3.5.0	2018-04-20 17:01:26 +01:00
Nicole Thomas	cebcd6d069	Merge pull request #47197 from dwoz/testfix ... Move process target to top level module namespace	2018-04-20 11:41:05 -04:00
Nicole Thomas	d4269c2b70	Merge pull request #47193 from Ch3LL/network_test ... Add network module integration tests	2018-04-20 09:37:18 -04:00
Daniel A. Wozniak	25803c9176	Move process target to top level module namespace	2018-04-19 18:38:28 -07:00
Nicole Thomas	c777248a78	Merge pull request #47189 from Ch3LL/autoruns ... Add autoruns.list integration test for Windows	2018-04-19 17:16:33 -04:00
Ch3LL	bbf9987c19	Add network module integration tests	2018-04-19 16:17:35 -04:00
Nicole Thomas	65f344e371	Merge pull request #47184 from Ch3LL/status_test ... Add status module integration modules tests for Windows	2018-04-19 15:38:55 -04:00
Ch3LL	6a88bedb7a	Add autoruns to windows whitelist	2018-04-19 15:12:08 -04:00
Ch3LL	e9e4d4af70	Add autoruns.list integration test for Windows	2018-04-19 15:09:50 -04:00
Nicole Thomas	0a43dde5fc	Merge pull request #47185 from twangboy/add_tests ... Add additional integration tests to whitelist	2018-04-19 14:20:24 -04:00
twangboy	345daa0423	Add additional integration tests to whitelist	2018-04-19 10:52:14 -06:00
Ch3LL	25a84428b8	Add status module integration modules tests for Windows	2018-04-19 12:01:40 -04:00
Daniel A. Wozniak	cadd759727	Use warnings to warn user	2018-04-19 08:26:50 -07:00
Daniel A. Wozniak	144c68e214	Allow non admin name based runs on windows	2018-04-19 00:18:17 -07:00
Nicole Thomas	d5997d2301	Merge pull request #47110 from kstreee/fix-misusing-of-timeout ... Fixes misusing of the timeout option.	2018-04-18 13:16:19 -04:00
Nicole Thomas	f5e63584d4	Merge pull request #47134 from Ch3LL/user_win_test ... Add user integration tests for windows OS	2018-04-18 10:29:39 -04:00
Ch3LL	e7c9bc4038	Add user integration tests for windows OS	2018-04-17 16:45:41 -04:00
Nicole Thomas	eb5ac51a48	Merge pull request #47102 from gtmanfred/2017.7 ... dont allow using no_use_wheel for pip 10.0.0 or newer	2018-04-17 16:44:57 -04:00
Daniel Wallace	3dc93b310b	fix tests	2018-04-17 13:18:18 -05:00
Daniel Wallace	4c07a3d1e9	fix other tests	2018-04-17 09:23:03 -05:00
Daniel Wallace	b71e3d8a04	dont allow using no_use_wheel for pip 10.0.0 or newer ... The --no-use-wheel flag has been deprecated in pip 10.0.0	2018-04-17 09:23:02 -05:00
kstreee	0624aee0ed	Fixes misusing of the timeout option.	2018-04-17 14:21:15 +09:00
Daniel A. Wozniak	3d85e30ce5	AsyncTestCase is required for AsyncEventPublisher ... Other tests that use AsyncTestCase's io_loop will break if AsyncTestCase is not subclassed when a test instantiates AsyncEventPublisher.	2018-04-16 14:18:08 -07:00
Mike Place	03892eaf0b	Merge pull request #47068 from cachedout/catch_value_error_socket_test ... Catch an operation on a closed socket in a test	2018-04-16 13:56:02 -06:00
Shane Lee	673cd31c65	Merge branch '2017.7' into jinja_test_fix	2018-04-16 10:15:27 -06:00
Daniel A. Wozniak	444da3f893	Fix py3 wart (chr vs bytesstring)	2018-04-14 17:39:29 -07:00
Daniel A. Wozniak	46fa2c04de	Fix py3 os.linesep wart	2018-04-14 17:09:50 -07:00
Daniel A Wozniak	e8acca01c2	Fix failing state test by normalizing line endings ... Fixes: integration.modules.test_state.StateModuleTest.test_issue_1896_file_append_source	2018-04-14 15:45:11 -07:00
Daniel Wozniak	7fddad6cd9	Merge pull request #47064 from dwoz/roots_tests_fix ... Fix fileserver roots tests	2018-04-14 14:30:22 -07:00
Mike Place	977c6939c4	Merge pull request #47069 from cachedout/match_timeout_arg ... Pass the timeout variable to the CLI when calling salt in tests	2018-04-14 09:20:25 -06:00
Mike Place	b8990f5258	Pass the timeout variable to the CLI when calling salt in tests	2018-04-13 16:37:01 -06:00
Nicole Thomas	c484c0bd71	Merge pull request #47055 from bloomberg/GH-47000 ... #47000 - add proper handling of full_return in cmd_subset	2018-04-13 16:17:09 -04:00
Daniel A. Wozniak	3c565d7e54	Use salt.utils.fopen	2018-04-13 13:14:19 -07:00
Mike Place	7db5625632	Catch an operation on a closed socket in a test ... This failure wouldn't be related to the test in question so it should be safe to ignore.	2018-04-13 13:54:18 -06:00
Daniel A. Wozniak	25fd7c0694	fix py3 wart, encode os.linesep	2018-04-13 12:33:23 -07:00
Daniel A. Wozniak	aa965310f1	Clean up cruft	2018-04-13 10:27:17 -07:00
Daniel A Wozniak	efc9866580	Jinja test fixes	2018-04-13 10:23:34 -07:00
Daniel A Wozniak	d79f1a1961	Fix fileserver roots tests	2018-04-13 10:15:13 -07:00
Matt Phillips	8af3f5b874	GH-47000: add proper handling of full_return in cmd_subset ... as noted in the original issue, full_return wasnt being handled properly. This rectifies that.	2018-04-13 10:58:03 -04:00
twangboy	6635b9003f	Fix winrm powershell script ... Removes the `Hostname` paramater in the winrm create command. It is not needed. It must match the hostname on the certificate, which is not defined in the case of the Remote Desktop certificate Removes extra spaces	2018-04-12 14:41:19 -06:00
Daniel Wallace	385fe2bc1e	Merge pull request #47020 from rallytime/bp-46970 ... Back-port #46970 to 2017.7	2018-04-11 16:48:24 -05:00
Gareth J. Greenaway	9373dff52b	Update test_pkgrepo.py	2018-04-11 10:55:36 -04:00
Gareth J. Greenaway	13cf9eb5b1	Removing debugging.	2018-04-11 10:55:36 -04:00
Gareth J. Greenaway	a61a8593e5	Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments.	2018-04-11 10:55:36 -04:00
Nicole Thomas	8f994e7cf9	Merge pull request #46539 from jfoboss/patch-1 ... #46504 Fix	2018-04-11 10:13:23 -04:00
Nicole Thomas	74d70e95a5	Merge pull request #46999 from gtmanfred/2017.7 ... switch pip test package	2018-04-10 17:18:32 -04:00
Daniel Wallace	791af8f6ce	switch pip test package ... Using irc3-plugins-test, since this should never be updated (i manage it and it is fulfilling its only job).	2018-04-10 14:09:20 -05:00
twangboy	19c3fadbe5	Fix unit test for win_ntp	2018-04-10 12:12:17 -06:00
Mike Place	0ac0b3ca29	Merge branch '2017.7' into parallel-orch	2018-04-10 11:31:58 -06:00
Nicole Thomas	39d65a39cf	Merge pull request #46613 from myinitialsarepm/fix_puppet.fact_and_puppet.facts ... Fix puppet.fact and puppet.facts to use stdout.	2018-04-10 11:18:07 -04:00
Nicole Thomas	00c4067585	Merge pull request #46975 from gtmanfred/windows ... Make windows work for test runs in jenkinsci	2018-04-10 09:41:17 -04:00
Peter Morris	44ecd13abc	Update tests to use cmd.run_all	2018-04-10 01:11:03 +01:00
Matt Phillips	a9866c7a03	fix parallel mode py3 compatibility ... parallel: True codepath incompatibilities uncovered by the added tests. additionally use salt.serializers.msgpack to avoid other py2/py3/back compat issues.	2018-04-05 22:30:59 -04:00
Matt Phillips	6d7730864a	removing prereq from test orch ... seems to be encountering unrelated preexisting failures in the functionality unrelated to my changes.	2018-04-05 11:45:25 -04:00
Matt Phillips	6c8a25778f	add integration test to runners/test_state to exercise parallel ... this should hopefully exercise a few different facets of parallel that were previously not covered in the code base.	2018-04-05 11:45:25 -04:00
Nicole Thomas	d0f5b43753	Merge pull request #44926 from frogunder/whitelisted_acl ... whitelist_acl_test	2018-04-05 11:09:25 -04:00
Mike Place	7d822f9cec	Merge pull request #46464 from gtmanfred/orchestration ... fix salt subset in orchestrator	2018-04-05 09:52:00 -05:00
Nicole Thomas	18e460fc30	Merge branch '2017.7' into whitelisted_acl	2018-04-04 17:28:40 -04:00
Daniel A. Wozniak	dc54fc53c3	Fix multiple typos causing tests to fail	2018-04-04 14:20:51 -07:00
Nicole Thomas	f70f6de282	Merge pull request #46647 from twangboy/win_fix_test_grains ... Fix the tear down function in integration.modules.test_grains	2018-04-04 17:14:05 -04:00
Daniel Wallace	637cdc6b7b	fix pylint	2018-04-04 14:37:04 -05:00
Daniel Wallace	2edd5eaf9e	fix path	2018-04-04 13:37:39 -05:00
Daniel Wallace	4a3ed6607d	add test for subset in orchestration	2018-04-03 15:13:00 -05:00
Gareth J. Greenaway	13875e78cf	Fixing documention string for test.	2018-04-03 12:37:49 -07:00
Gareth J. Greenaway	3d288c44d4	Fixing test documentation	2018-04-03 12:37:49 -07:00
Gareth J. Greenaway	6cff02ef6a	Adding tests for #46788	2018-04-03 12:37:49 -07:00
Daniel Wallace	bff61dd291	use http registry for npm ... Older versions of npm can't validate the newer certificate. We don't really need to worry about this, and it would be better to just make sure the tests run correctly that to use https for the tests.	2018-04-03 09:44:48 -05:00
Nicole Thomas	ebf5dd276f	Merge pull request #46783 from twangboy/fix_46680 ... Fix network.managed test=True on Windows	2018-04-03 08:54:55 -04:00
Nicole Thomas	f652f25cc1	Merge pull request #46821 from rallytime/fix-mantest-failures ... Fix the new test failures from the mantest changes	2018-04-03 08:40:50 -04:00
Nicole Thomas	df26f2641e	Merge pull request #46675 from dwoz/inspectlib-tests ... Skip test when git symlinks are not configured	2018-04-03 08:19:18 -04:00
twangboy	da5ce25ef3	Fix unit tests on Linux	2018-04-02 19:59:13 -06:00
rallytime	209a8029c3	Fix the new test failures from the mantest changes ... The changes in #46778 introduced a couple of test failures into the 2017.7 branch. This PR cleans up some of the references causing failures on 3 new test failures. The failures are due to the new reference of the `mantest` module, which is only used for testing here, and not an actual module in salt to test docs and the saltutil module against.	2018-04-02 16:06:50 -04:00
Nicole Thomas	3bac9717f4	Merge pull request #46769 from dwoz/wincloudtest ... Adding windows minion tests for salt cloud	2018-04-02 14:51:48 -04:00
Mike Place	e533b7182d	Merge pull request #46766 from twangboy/win_fix_test_git ... Change the way we're cleaning up after some tests	2018-03-30 12:01:02 -06:00
Mike Place	69d450db84	Merge pull request #46778 from terminalmage/salt-jenkins-906 ... Replace flaky SPM man test	2018-03-30 11:55:13 -06:00
Daniel A. Wozniak	d39f4852d8	Handle non-zero status exception	2018-03-29 14:39:40 -07:00
Daniel A. Wozniak	83c005802b	Handle cases where git can not be found ... Signed-off-by: Daniel A. Wozniak <dwozniak@saltstack.com>	2018-03-29 14:39:29 -07:00
Daniel A. Wozniak	eabc234e5d	Fix config override name	2018-03-29 13:41:06 -07:00
Nicole Thomas	395b7f8fdc	Merge pull request #46655 from dwoz/pyobjects-46350 ... Fixing cleanUp method to restore environment	2018-03-29 14:31:47 -04:00
Nicole Thomas	af45c49c42	Merge pull request #46632 from dwoz/file-recurse-36802 ... Fix file.recurse w/ clean=True #36802	2018-03-29 14:30:41 -04:00
Erik Johnson	bbfd35d3ea	Replace flaky SPM man test ... This replaces a test that has been intermittently failing, and also expands it to check for _all_ man pages.	2018-03-29 12:19:41 -05:00
Daniel A. Wozniak	5c22a0f88d	Use aboslute imports	2018-03-28 22:32:30 -07:00
Daniel A. Wozniak	44db77ae79	Fix lint errors and typo	2018-03-28 21:06:34 -07:00
Daniel A. Wozniak	5aabd442f2	Fix up import and docstring syntax	2018-03-28 20:54:35 -07:00
Daniel A. Wozniak	810042710d	Set default cloud test timeout back to 500 seconds	2018-03-28 20:39:03 -07:00
Daniel A. Wozniak	5ac89ad307	Use winrm_verify_ssl option causing tests to pass	2018-03-28 20:21:40 -07:00
Daniel A. Wozniak	ba5f11476c	Adding windows minion tests for salt cloud	2018-03-28 15:16:54 -07:00
twangboy	5afc66452c	Remove unused/redundant imports	2018-03-28 12:30:26 -06:00
Nicole Thomas	d3623e0815	Merge pull request #46691 from Ch3LL/win_group_test ... Add groupadd module integration tests for Windows	2018-03-28 14:01:45 -04:00
Nicole Thomas	14ab50d3f4	Merge pull request #46696 from dwoz/win_test_client ... Windows `unit.test_client` fixes	2018-03-28 13:55:46 -04:00
twangboy	88fd72c52c	Use with_tempfile decorator where possible	2018-03-28 11:38:32 -06:00
Nicole Thomas	bd1e8bcc7d	Merge pull request #46734 from terminalmage/busybox ... Make busybox image builder work with newer busybox releases	2018-03-27 17:14:28 -04:00
Nicole Thomas	c09c6f819c	Merge pull request #46742 from gtmanfred/2017.7 ... only use npm test work around on newer versions	2018-03-27 17:13:28 -04:00
Daniel A. Wozniak	62d64c9230	Fix missing import	2018-03-27 14:10:24 -07:00
Ch3LL	4f1c42c0e3	Workaround getpwnam in auth test for MacOSX	2018-03-27 15:18:29 -04:00
Daniel Wallace	fd0e649d1e	only use npm test work around on newer versions ... The workaround only needs to be applied to versions of npm newer than 5.1, but they work with versions newer than 5.0, so just do all newer versions using the work around	2018-03-27 13:51:21 -05:00
Daniel A. Wozniak	18b1730320	Skip test that requires pywin32 on *nix platforms	2018-03-27 11:38:20 -07:00
Daniel A. Wozniak	ec4634fc06	Better explanation in doc strings	2018-03-27 10:35:51 -07:00
Erik Johnson	6502b6b4ff	Make busybox image builder work with newer busybox releases	2018-03-27 10:55:52 -05:00
Nicole Thomas	3f21e9cc65	Merge pull request #46503 from psyer/fix-cmd-run-env-corrupt ... Fixes stdout user environment corruption	2018-03-27 10:20:14 -04:00
Daniel A. Wozniak	45dce1a485	Add reg module to globals	2018-03-26 12:00:39 -07:00
Nicole Thomas	fadc5e4ba4	Merge pull request #46669 from terminalmage/pillar-merge-order ... Add option to return to pre-2017.7.3 pillar include merge order	2018-03-26 15:00:27 -04:00
Daniel A. Wozniak	d9ae2abb34	Fix splling in docstring	2018-03-26 09:45:04 -07:00
Nicole Thomas	6c80d90bb6	Merge pull request #46693 from dwoz/test_smtp_return ... File and Pillar roots are dictionaries	2018-03-26 11:15:37 -04:00
Nicole Thomas	47409eaa6e	Merge pull request #46646 from twangboy/win_fix_test_local_cache ... Fix `unit.returners.test_local_cache` for Windows	2018-03-26 10:16:22 -04:00
Daniel A Wozniak	b40efc5db8	Windows test client fixes ... - Skip IPC transport test on windows - Add TCP transport test for windows	2018-03-23 15:36:32 -07:00
Daniel A. Wozniak	5bf850c67f	File and Pillar roots are dictionaries ... Fixes test_smtp_return test cases.	2018-03-23 11:42:14 -07:00
Ch3LL	7cda825e90	Add groupadd module integration tests for Windows	2018-03-23 13:30:22 -04:00
Daniel A Wozniak	628b87d5c4	Skip test when git symlinks are not configured	2018-03-22 23:30:15 -07:00
Daniel A. Wozniak	73d06f664b	Fix linter error	2018-03-22 13:47:41 -07:00
Erik Johnson	b4a1d34b47	Add option to return to pre-2017.7.3 pillar include merge order ... https://github.com/saltstack/salt/pull/45025 changed the pillar include merge order. This adds a new config option which allows a user to revert to the pre-2017.7.3 behavior.	2018-03-22 13:35:12 -05:00
Daniel A. Wozniak	009a8f56ea	Fix up environ state tests for Windows	2018-03-22 11:31:25 -07:00
Daniel A. Wozniak	b4be10b8fc	Fixing cleanUp method to restore environment ... The clean-up method was not reliabliy restoring sys.environment on windows. Using Mock's patch to cleanup more reliably.	2018-03-21 20:01:30 -07:00
Mike Place	33af3cfc7c	Merge pull request #46631 from rallytime/update-pillar-unit-tests ... Fix pillar unit test failures: file_roots and pillar_roots environments should be lists	2018-03-21 19:22:48 +00:00
twangboy	c179388b0e	Fix the tear down function in integration.modules.test_grains.GrainsAppendTestCase ... Fix the tear down function to just set the grain to an empty list instead of removing each individual item	2018-03-21 16:37:10 +00:00
twangboy	8d93156604	Fix unit.returners.test_local_cache for Windows ... time.time is only precise to 3 decimal places in Windows. This adds a sleep for .25 seconds to allow the test to pass Also fixes a lint error	2018-03-21 16:00:52 +00:00
Erik Johnson	e8582e80f2	Python 3-compatibility fix to unit test ... This should not be returning a string type for stderr, since Popen.communicate() returns a bytestring. In Python 2, the str and bytes types are the same, but the same is not true in Python 3. Additionally, the mocking here seems not to consider the fact that Popen is called when runas is used to get the runas user's environment. Since this test doesn't care about the output, we can just make the mocked Popen.communicate() return an empty bytestring.	2018-03-20 22:09:18 -05:00
Daniel A. Wozniak	eb822f5a12	Fix file.recurse w/ clean=True #36802 ... Fix an endless looping but in file.recurse when clean is set to true. This patch normalizes paths and handles the root correctly.	2018-03-20 16:12:01 -07:00
rallytime	0f728186aa	Fix pillar unit test failures: file_roots and pillar_roots environments should be lists	2018-03-20 17:49:58 -04:00
Nicole Thomas	83ed40c06a	Merge pull request #46619 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.5 to 2017.7	2018-03-20 15:03:29 -04:00
Nicole Thomas	f038e3c452	Merge pull request #46571 from garethgreenaway/46552_onfail_and_require ... [2017.7] fixes to state.py	2018-03-20 09:40:03 -04:00
Nicole Thomas	7bc3c2e588	Merge pull request #46531 from terminalmage/issue44299 ... Fix regression in yumpkg._parse_repo_file()	2018-03-20 09:34:58 -04:00
rallytime	bcbddf5d07	Merge branch '2017.7.5' into '2017.7' ... No conflicts.	2018-03-20 09:10:38 -04:00
Nicole Thomas	cdd768fa4d	Merge pull request #46577 from gtmanfred/2017.7.5 ... Fix npm issue	2018-03-19 07:51:03 -04:00
Nicole Thomas	e6682c660c	Merge pull request #46551 from terminalmage/salt-jenkins-885 ... Fix failing pkg integration test on OpenSUSE	2018-03-19 07:50:11 -04:00
Daniel Wallace	78cbf7b5cd	Fix npm issue ... Fixes saltstack/salt-jenkins#884	2018-03-16 09:04:09 -06:00
Gareth J. Greenaway	152c43c843	Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran.	2018-03-15 17:45:42 -07:00
Daniel A. Wozniak	3b6901e19d	Honor named tests when running integration suites	2018-03-15 13:16:43 -07:00
Daniel Wallace	8d5ab72983	virtualenv version too old for python3.6 ... This test is testing an old version of virtualenv with pip_env, and the version of pip is 6.x.x, which is too old and doesn't work with the importlib in python 3.6. Skipping this test if python is newer then 3.5.	2018-03-15 12:18:23 -06:00
Nicole Thomas	98e3260b9a	Merge pull request #46548 from Ch3LL/profit_test ... profitbrick test: check for foo,bar username,password set in profitbrick config	2018-03-15 10:25:27 -04:00
Erik Johnson	010d260d06	Rewrite failing Suse pkg integration test ... This makes the test less brittle by hard-coding which package to use	2018-03-14 23:35:25 -05:00
Ch3LL	bb338c464c	Fix dimensionsdata test random_name call	2018-03-14 15:28:06 -04:00
Ch3LL	db96c4e72e	check for foo,bar username,password set in profitbrick config	2018-03-14 14:57:48 -04:00
Erik Johnson	ce391c53f4	Add regression test for #44299	2018-03-13 21:30:14 -05:00
Frode Gundersen	1ad4d7d988	fix assert errors	2018-03-13 21:01:46 +00:00
Frode Gundersen	e6a56016df	update test	2018-03-13 20:54:25 +00:00
Nicole Thomas	22d753364b	Merge pull request #46337 from gtmanfred/2017.7 ... Fix using names with listen and listen_in	2018-03-12 14:49:59 -04:00
Nicole Thomas	b7191b8782	Merge pull request #46413 from meaksh/2017.7-explore-result-in-depth ... Explore 'module.run' state module output in depth to catch "result" properly	2018-03-12 14:49:06 -04:00
Nicole Thomas	cac096b311	Merge pull request #46434 from gtmanfred/highstate_return ... split return key value correctly	2018-03-09 12:45:20 -05:00
Daniel Wallace	d18f1a55a7	fix pylint	2018-03-09 08:23:17 -07:00
Nicole Thomas	a188984cd9	Merge pull request #46446 from bdrung/fix-typos ... Fix various typos	2018-03-08 16:11:46 -05:00
Daniel Wallace	9e2c3f7991	split return key value correctly	2018-03-08 13:38:52 -07:00
Nicole Thomas	e35fc5263c	Merge pull request #46309 from bdrung/dynamic-pillarenv ... Support dynamic pillar_root environment	2018-03-08 14:15:35 -05:00
Nicole Thomas	35fe9827fe	Merge pull request #46430 from terminalmage/issue44032 ... Improve reliability/idempotence of file.blockreplace state	2018-03-08 10:41:37 -05:00
Benjamin Drung	a3c54b50f6	Fix various spelling mistakes ... lintian found various spelling mistakes. Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>	2018-03-08 15:25:42 +01:00
Benjamin Drung	584b451fd1	Support dynamic pillar_root environment ... Allow users to specify a __env__ pillar_root directory that applies equally to all environments that are not explicitly specified. fixes #20581 Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>	2018-03-08 10:12:40 +01:00
Erik Johnson	f9f187e915	Improve reliability/idempotence of file.blockreplace state ... This makes the following changes: - The `append_newline` argument to the `file.blockreplace` remote-execution function has been modified so that if its value is `None`, it only appends a newline when the content block does not end in one. - A couple of fixes were made to newline handling. The existing code normalized the newlines in the content block, replacing them with os.linesep. However, when the file contains newlines that don't match the OS (i.e. POSIX newlines in a file on a Windows box, or Windows newlines on a Linux/Mac/BSD/etc. box), then we would still end up with mixed newlines. The line separator is now detected when we read in the original file, and the detected line separator is used when writing the content block. Additionally, the same newline mismatch was possible when appending/prepending the content block. This has been fixed by using a common function for appending, prepending, and replacing the content block. - Support for the `append_newline` argument has been added to the `file.blockreplace` state. The default value for the state is `None`. A `versionchanged` has been added to the remote execution function to let users know that the Fluorine release will change the default value of that variable. - 20 new integration tests have been written to test the `file.blockreplace` state.	2018-03-07 22:29:39 -06:00
Nicole Thomas	93a572f229	Merge pull request #46100 from jfindlay/resolv_scope ... Handle IPv6 scope parameter in resolv.conf	2018-03-07 14:51:19 -05:00
Pablo Suárez Hernández	885751634e	Add new unit test to check state.apply within module.run	2018-03-07 15:43:52 +00:00
Daniel Wallace	3620611b5b	fix unhold package for debian	2018-03-06 14:54:40 -07:00
Justin Findlay	d5561bedaf	tests.unit.grains.core add scoped IPv6 nameserver	2018-03-05 12:31:04 -08:00
Daniel Wallace	d6d9e36359	add tests for names and listen/listen_in ... Closes #30115	2018-03-05 12:15:23 -07:00
Nicole Thomas	a8f2f1b063	Merge pull request #46322 from terminalmage/issue44935 ... yamlify_arg: don't treat leading dashes as lists	2018-03-05 10:40:16 -05:00
Nicole Thomas	88b5f7383d	Merge pull request #46242 from redbaron4/fix-46127 ... Pass env_vars to pip.freeze	2018-03-05 09:53:12 -05:00
Erik Johnson	85ac6a9893	yamlify_arg: don't treat leading dashes as lists ... We had a similar check to ensure "foo: bar" isn't loaded as a dict, this adds a check to ensure that we only load lists when there is a leading bracket.	2018-03-03 15:02:12 -06:00