6424 Commits

Author	SHA1	Message	Date
Erik Johnson	9338370477	Add unit tests for loader optimization levels	2018-08-08 11:22:52 -05:00
rallytime	1a23bb233f	Update expected return value in boto test ... The expected return from moto has changed from `-1` to `None` in the latest version of moto (1.3.4). This PR updates the test to be in line with the return from moto.	2018-08-08 10:42:57 -04:00
Nicole Thomas	801eae3b8d	Merge pull request #48672 from frogunder/45012 ... add service enabled test	2018-07-23 11:38:48 -04:00
Nicole Thomas	ead19725b6	Merge branch '2017.7' into fix_48169	2018-07-20 10:45:59 -04:00
Frode Gundersen	0747f2e58a	add service enabled test	2018-07-19 16:47:56 +00:00
William Yardley	7ff3c9c5ff	Improve handling of npm json output (#43138) ... Rather than look for [ or { at the beginning of a line to identify the json output, just use salt.utils(.json).findjson.	2018-07-18 21:42:28 -07:00
Nicole Thomas	6973152057	Merge pull request #48534 from xetix/fix-zypper-latest_version ... Fix behaviour of function latest_version in zypper module when multip…	2018-07-13 15:56:05 -04:00
Nicole Thomas	9985f0b4c1	Lint: remove extra blank line	2018-07-13 15:55:08 -04:00
Daniel A Wozniak	136ddf5f54	Finally fix prepend for real	2018-07-13 11:25:27 -07:00
Daniel A Wozniak	66b25e65bf	Fix failing prepend test ... The prepend test is failing when jenkins runs kithchen but is passing in my test environment. Make sure each test starts without the 'etc' path existing.	2018-07-12 19:04:47 -07:00
Patrik	5fbead8a36	Merge branch '2017.7' into fix-zypper-latest_version	2018-07-12 21:05:54 +02:00
xetix	db35d0c1e1	Adding testcase for this fix.	2018-07-12 20:58:16 +02:00
Daniel A Wozniak	c858bf477f	Remove which mock to get the test passing ... This test passes in my local kitchen tests when the which mock is removed. However, I added this mock to try and get the test passing in jenkins. The original failure that caused me to add it was removed from jenkins. This will either fix the test or reveal the other error that needs to be fixed.	2018-07-12 11:14:47 -07:00
Nicole Thomas	a7e52f0de2	Merge pull request #48429 from rallytime/bp-46824 ... Back-port #46824 to 2017.7	2018-07-03 17:45:36 -04:00
Daniel A. Wozniak	349a2b279e	Prepend test needs file.touch method	2018-07-03 13:32:02 -07:00
Beorn Facchini	8b4486248d	Added ignore_retcode to mock unit tests	2018-07-03 16:05:04 -04:00
Nicole Thomas	83e387c951	Merge pull request #48410 from dwoz/service_dead_test_fix ... Fix service dead test on windows	2018-07-03 10:17:28 -04:00
Daniel A. Wozniak	5c0923448d	Fix service dead test on windows	2018-07-02 12:03:03 -07:00
Daniel A. Wozniak	9c7085b70f	Fix file state prepend test	2018-07-02 11:30:55 -07:00
Daniel Wozniak	10e93bff7f	Merge pull request #48396 from dwoz/symlink_test_fix ... Fix file.symlink state test for windows	2018-07-02 11:10:31 -07:00
Daniel A. Wozniak	d3456d31e6	Fix file.symlink state test for windows	2018-06-30 15:44:58 -07:00
twangboy	77629f640a	Fix module unit tests	2018-06-29 11:15:23 -06:00
twangboy	707906ac15	Fix unit.state.test_powercfg ... Add test for test=True	2018-06-27 16:06:58 -06:00
twangboy	32c5014eb6	Fix unit tests	2018-06-27 16:06:57 -06:00
Nicole Thomas	731ec0a11a	Merge pull request #48037 from terminalmage/fix-custom-types-sync-docs ... Add "sync_mods" argument to state.apply/state.sls	2018-06-21 15:57:02 -04:00
Erik Johnson	8b1bd0eda2	Update test to reflect changed argument name	2018-06-21 11:39:12 -05:00
Nicole Thomas	e079fce38d	Merge pull request #48190 from terminalmage/fix-vfstab-test ... Fix mount.vfstab unit test	2018-06-18 17:47:54 -04:00
Erik Johnson	8d70d14362	Fix mount.vfstab unit test ... This test was calling mount.fstab() instead of mount.vfstab()	2018-06-18 13:21:40 -05:00
Erik Johnson	9af09e0127	Mock config.get due to changes in _refresh_mine_cache	2018-06-18 00:05:25 -05:00
Erik Johnson	d403ae58d7	Add unit test for docker.update_mine	2018-06-17 21:42:28 -05:00
Nicole Thomas	df2a156338	Merge pull request #48061 from garethgreenaway/port_47049_2017_7 ... [2017.7] Porting #47049 to 2017.7.	2018-06-15 13:15:49 -04:00
Gareth J. Greenaway	7c472fed51	Fixing failing test_set_hwclock_aix test.	2018-06-13 10:15:28 -07:00
Gareth J. Greenaway	ccb0acc958	Porting #47049 to 2017.7.	2018-06-13 10:15:28 -07:00
Erik Johnson	6fe711ad76	Reverse monkeypatching after test_symlink_list finishes ... On Windows, in test_symlink_list we monkeypatch the file_roots. However, we don't ever reverse that monkeypatching. This would not have affected other test classes, because the opts we are monkeypatching are ones created specifically for that test class. And due to the lexicographic order in which the tests are run, test_symlink_list is run last. However, if we were to ever add a test to that test class which would run after test_symlink_list, it would be affected by the monkeypatching.	2018-06-13 09:58:29 -05:00
Erik Johnson	cb8e6f9fb8	Remove redundant mocking ... This mocking was added to setup_loader_modules and is no longer needed in individual tests.	2018-06-08 12:26:31 -05:00
Erik Johnson	bc3ad795e9	Add test for sync argument to state.sls	2018-06-08 12:22:50 -05:00
Daniel Wallace	8d15b93d00	remove tox virtualenvs from doc tests	2018-06-06 12:22:22 -05:00
Daniel Wallace	556a2067fc	fix masterapi test to use testing directory for configs	2018-06-05 18:36:27 -05:00
Erik Johnson	8cb33d3dec	Quiet the linter ... We need this import to determine whether we have the needed modules to run the test, even though it is not invoked directly.	2018-05-31 15:28:25 -05:00
Erik Johnson	91cd57d1e0	Update mocking to reflect changes in service module	2018-05-31 15:28:25 -05:00
Erik Johnson	b9ace5a859	Fix crappy mocking ... This fixes some poorly-conceived mocking that was done because of some equally dumb imports being done in salt/modules/junos.py (which I fixed a few commits ago while in the process of cleaning up the docs).	2018-05-31 15:28:25 -05:00
Erik Johnson	bc9e3acef3	Lint fixes	2018-05-31 15:28:25 -05:00
Erik Johnson	93ee5ee2b0	Fix all Sphinx warnings ... Well, all but one, which we expect to see	2018-05-31 15:28:25 -05:00
Nicole Thomas	799fce979d	Merge pull request #47552 from twangboy/fix_46981 ... Show GPO settings, raise error if trying to set gpo managed settings	2018-05-25 16:41:21 -04:00
Nicole Thomas	6889befc6b	Merge branch '2017.7' into solaris_product_grains	2018-05-25 09:57:40 -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
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
rallytime	17596f3025	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-22 11:26:44 -04:00