8326 Commits

Author	SHA1	Message	Date
rallytime	1a5ef996e3	Add 'minion_data_cache: True' to mocked opts for minions unit tests	2018-08-24 13:00:43 -04:00
Nicole Thomas	914bb09667	Merge pull request #49282 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-24 12:45:49 -04:00
rallytime	21a51c9336	Add 'minion_data_cache: True' to mocked opts for minions unit tests	2018-08-24 09:44:15 -04:00
rallytime	37f24fda78	Fix unit test for file state ... Chose the wrong side of a merge conflict resolution. This commit restores the correct testing behavior.	2018-08-23 16:18:29 -04:00
Nicole Thomas	158c1ca575	Merge pull request #49276 from terminalmage/fix-moved-funcs ... Fix paths to moved functions	2018-08-23 12:38:54 -04:00
rallytime	c3ecefc785	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/file.py - salt/modules/win_service.py - salt/states/mount.py - salt/states/service.py - tests/integration/__init__.py - tests/integration/runners/test_state.py - tests/integration/states/test_file.py - tests/unit/states/test_file.py	2018-08-23 11:50:41 -04:00
Erik Johnson	322a988def	Fix paths to moved functions	2018-08-23 08:32:11 -05:00
Daniel A. Wozniak	51bf79afd9	Add async helper to test_sock_path_len ... This test function is causing another test: unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription To fail with 'Async operation timed out after 5 seconds', Adding the tornado Async test helper so that both tests pass.	2018-08-22 14:49:34 -07:00
Daniel Wozniak	ec32428f9b	Merge pull request #49244 from dwoz/gitfs_fixes ... Test fixes: unit.fileserver.test_gitfs	2018-08-22 13:19:41 -07:00
Erik Johnson	6b51f71e40	Fix failing unit file module unit tests ... This just looks to have been incorrectly handled in a merge-forward.	2018-08-22 14:22:44 -05:00
Mike Place	6d023cab6e	Merge pull request #49245 from dwoz/skip_grep_windows ... Skip grep unit tests on windows	2018-08-22 09:18:07 -06:00
Daniel A. Wozniak	5a0cda51ed	Older GitPython version do not have a close method	2018-08-22 03:27:48 -07:00
Daniel A. Wozniak	e30589194e	Skip grep unit tests on windows ... These tests are specific to unix like platforms that have grep installed. On windows we use the win_file module.	2018-08-22 00:08:12 -07:00
Daniel A. Wozniak	74527158ec	Fix up fileserver.test_gitfs tests on windows	2018-08-21 23:45:59 -07:00
Daniel A. Wozniak	86e3c46959	Revert newline translation change ... On windows, newlines will be CRLF since we added unix2dos to kitchen.	2018-08-21 20:43:41 -07:00
Daniel A. Wozniak	acc144d6a9	Fix directory unit test	2018-08-17 14:08:58 -07:00
Daniel A. Wozniak	913ea5ebde	Fix directory unit test	2018-08-17 14:07:19 -07:00
Daniel A. Wozniak	a7ee07ab81	Fix is_windows checks	2018-08-17 13:48:31 -07:00
Daniel A. Wozniak	74b197f643	Account for normalized dirs in unit tests	2018-08-17 13:36:41 -07:00
Daniel A. Wozniak	3363238ff6	Account for normalized dirs in unit tests	2018-08-17 13:17:08 -07:00
Erik Johnson	8bda1e5ae3	Merge pull request #49091 from terminalmage/rename-test-files ... Rename/re-organize test files in 2018.3 branch	2018-08-17 07:26:43 -05:00
Wesley Whetstone	990fdb6a52	decorator link fix, updating context names, as well as updating macutils tests for latest changes	2018-08-15 11:43:20 -04:00
Mike Place	c8510a6b96	Merge pull request #49062 from weswhet/fix-mac-available-services ... fix memoize on available macOS services	2018-08-15 17:34:24 +02:00
Wesley Whetstone	f1b40c4411	decorator link fix, updating context names, as well as updating macutils tests for latest changes	2018-08-14 14:24:33 -07:00
Erik Johnson	613f0611f8	Lint	2018-08-14 13:53:31 -05:00
Erik Johnson	81f272f91a	Rename outputter tests to match naming convention	2018-08-14 13:53:31 -05:00
Erik Johnson	1fccbf764a	Rename acl unit test module to confirm to naming convention	2018-08-14 13:53:30 -05:00
Erik Johnson	160223dc80	Consolidate/move fileclient/fileserver tests to conform to naming convention	2018-08-14 13:53:30 -05:00
Erik Johnson	1aacf77b3e	Rename/consolidate salt.utils unit tests to conform to naming convention	2018-08-14 13:53:30 -05:00
Erik Johnson	5a0990b087	Rename pillar unit test modules to reflect naming convention	2018-08-14 13:53:30 -05:00
Erik Johnson	516594b164	Consolidate netapi tests and move them to reflect naming convention	2018-08-14 13:53:30 -05:00
Erik Johnson	8f5fef55d4	Consolitdate and move salt-ssh unit tests to proper location	2018-08-14 13:53:30 -05:00
Erik Johnson	9801ce3271	Consolidate and move loader tests to test/unit/test_loader.py	2018-08-14 13:53:29 -05:00
Erik Johnson	f72bbc5036	Rename beacon unit test modules to conform with naming convention ... Also consolidate pyroute2 network_settings tests into network_settings beacon test module.	2018-08-14 13:53:29 -05:00
Erik Johnson	fa76cb6ada	Move inspectlib tests to conform with naming convention	2018-08-14 13:53:29 -05:00
Erik Johnson	81e38239fe	Move shared kernelpkg test cases to tests/support/	2018-08-14 13:53:29 -05:00
Erik Johnson	e0d95b640f	Consolidate misplaced tests into tests/unit/test_config.py	2018-08-14 13:53:29 -05:00
Erik Johnson	3a1ec12613	Rename slack engine test file to respect naming convention	2018-08-14 13:53:29 -05:00
Erik Johnson	c9c9d20f19	Rename test_map_conf test file to respect naming convention	2018-08-14 13:53:29 -05:00
Erik Johnson	5c936c016d	Rename the aptpkg state module to respect naming convention	2018-08-14 13:53:29 -05:00
Erik Johnson	ac50eb84e1	Remove redundant "test" from filename	2018-08-14 13:53:29 -05:00
Erik Johnson	b03a56355b	Move jinja templating tests alongside salt/utils/jinja.py's tests	2018-08-14 13:53:29 -05:00
Erik Johnson	b49d8df210	Fix bad copypasta in docstring	2018-08-14 13:53:29 -05:00
Erik Johnson	069102b82d	Rename sentry returner test to match naming convention	2018-08-14 13:53:29 -05:00
Erik Johnson	23980830d1	Use tests.support.paths instead of deprecated integration module	2018-08-14 13:53:29 -05:00
Erik Johnson	ffb842d055	Move salt.utils.context tests to their proper location	2018-08-14 13:53:28 -05:00
Erik Johnson	d69069be13	Move context cache tests to their proper location	2018-08-14 13:53:28 -05:00
Nicole Thomas	0e1ed7b923	Merge pull request #49055 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-13 15:20:10 -04:00
rallytime	83a15cb623	Add optimization_order config to mocked opts	2018-08-13 12:06:48 -04:00
rallytime	ea6883ee55	Update old utils paths to new utils paths	2018-08-10 13:15:53 -04:00
rallytime	201031fa8a	Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt.7 - doc/ref/configuration/minion.rst - salt/cloud/clouds/ec2.py - salt/returners/highstate_return.py - tests/support/gitfs.py - tests/unit/loader/test_loader.py	2018-08-10 13:12:14 -04:00
Bo Maryniuk	b7da571624	Fix imports	2018-08-10 15:52:01 +02:00
rallytime	ed6fb8b739	Merge branch '2017.7.8' into '2017.7' ... No conflicts.	2018-08-10 09:08:47 -04:00
Nicole Thomas	4eeb75f028	Merge pull request #49033 from terminalmage/issue48996 ... Fix file.get_diff for remote files	2018-08-09 17:06:52 -04:00
Nicole Thomas	b24c96a292	Merge pull request #48926 from travispaul/fix-netbsd-8-new-ifconfig ... Handle ifconfig output differently for NetBSD >= 8.0	2018-08-09 16:07:43 -04:00
rallytime	a43d9b4ba6	Mark a jinja template test as flaky ... Fixes https://github.com/saltstack/salt-jenkins/issues/1059	2018-08-09 15:51:34 -04:00
Nicole Thomas	7d6b9ed0a5	Merge pull request #48803 from dmurphy18/aix_filesystems ... Support for execution modules and states mount on AIX	2018-08-09 13:51:54 -04:00
Nicole Thomas	9b6a9ff4f1	Merge pull request #48932 from twangboy/fix_win_repo ... Fix pkg.install when pkg already installed	2018-08-09 13:45:50 -04:00
Erik Johnson	d6e5038022	Fix file.get_diff for remote files ... Once the files were cached, the function was still trying to open the paths passed into it, not the cached paths. This fixes that and adds additional unit tests.	2018-08-09 10:56:05 -05:00
Travis Paul	d59b6d8269	Add unit test for NetBSD 8 ifconfig changes ... lint changes in salt/utils/network.py	2018-08-09 21:26:08 +08:00
David Murphy	92818f816b	Fixes for testing	2018-08-08 12:15:59 -06:00
David Murphy	77dd7a1743	Adjust unit tests	2018-08-08 12:15:59 -06:00
David Murphy	9fb5641dc7	Mount unit tests for modules and states for AIX	2018-08-08 12:15:59 -06:00
David Murphy	b28f427432	Save off work after laptop issue	2018-08-08 12:15:59 -06:00
Erik Johnson	0441cd56ef	Add optimization_order to mocking	2018-08-08 11:22:52 -05:00
Erik Johnson	a78663a301	Lint	2018-08-08 11:22:52 -05:00
Erik Johnson	764969ce08	Add a test to confirm that .py files are still loaded correctly ... Also, use USE_IMPORTLIB to gate testing on optimization_order, since this only works with Python 3.5+.	2018-08-08 11:22:52 -05:00
Erik Johnson	e7c10196da	Quiet the byte compiling for PY2	2018-08-08 11:22:52 -05:00
Erik Johnson	9338370477	Add unit tests for loader optimization levels	2018-08-08 11:22:52 -05:00
rallytime	9f0b9a1073	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:44:38 -04: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
rallytime	d0136b1be5	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 09:16:55 -04:00
Nicole Thomas	ab1a713bc3	Merge pull request #48934 from terminalmage/issue48777 ... Properly handle latin-1 encoding in file diffs	2018-08-07 17:02:23 -04:00
twangboy	47b2898a85	return empty dict on no changes	2018-08-07 12:25:15 -06:00
Erik Johnson	52c64e4d51	Fix to_unicode test ... Since latin-1 is not being automatically decoded, we need to explicitly pass it on the test.	2018-08-07 09:57:21 -05:00
twangboy	6532706d2f	Make the tests run on Linux	2018-08-06 17:55:46 -06:00
twangboy	cfe55a391a	Add tests for pkg.install output	2018-08-06 17:53:37 -06:00
Erik Johnson	d39fa889f3	Add stringutils.get_diff to mocks	2018-08-06 15:27:13 -05:00
Erik Johnson	f14f4dae22	Add unit test for latin-1 fallback, multi-encoding	2018-08-03 18:38:08 -05:00
Nicole Thomas	0272cadff8	Merge branch '2018.3' into unit_state	2018-08-03 16:30:28 -04:00
Ch3LL	b82dd708be	skip getpwnam check on mac in unit test_cmdmod	2018-08-02 16:39:49 -04:00
Ch3LL	5896c7fc36	remove base_top_file file in teardown and add sleep	2018-08-02 16:05:41 -04:00
Gareth J. Greenaway	0791b0a03c	FileGrepTestCase tests back to 2018.3	2018-07-31 09:33:58 -07:00
Gareth J. Greenaway	2e01c55e7e	Fixing a bug that prevents specifying wildcards for filenames.	2018-07-31 09:33:58 -07:00
Daniel Wozniak	69f81214d1	Merge pull request #48714 from dwoz/state_echo_fix ... Always transfer bytes from fileserver roots	2018-07-30 15:37:12 -07:00
Daniel A. Wozniak	ce3ed43dab	Always use unix line endings	2018-07-30 11:41:58 -07:00
Erik Johnson	52fc1c955d	Simplify file contents in roots fileserver test ... This removes the need to hard code contents in the test. The roots fileserver just reads from the file in binary mode, so we should be able to do the same in the test to confirm the correct behavior of the roots backend.	2018-07-27 09:16:59 -05:00
Nicole Thomas	6978ce5d1d	Merge pull request #48747 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-07-26 14:14:33 -04:00
Daniel A Wozniak	a89019e956	Multiple windows test fixes	2018-07-24 23:09:14 -07:00
rallytime	4122da40b5	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/integration/netapi/rest_tornado/test_app.py - tests/integration/states/test_service.py	2018-07-24 14:28:33 -04:00
Nicole Thomas	062fe7cccf	Merge pull request #48718 from garethgreenaway/48536_beacon_diskusage_fixes ... [2018.3] beacon diskusage fixes	2018-07-24 13:45:25 -04:00
Nicole Thomas	e873621009	Merge pull request #48711 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-07-24 13:38:57 -04:00
Daniel Wozniak	04ab17a4d6	Merge pull request #48726 from dwoz/syslogtest ... Skip test when syslog not available	2018-07-24 09:12:44 -07:00
Daniel A. Wozniak	6e7824266b	Windows compatible cp test	2018-07-23 23:27:29 -07:00
Daniel A. Wozniak	00f04cfd59	Skip test when syslog not available	2018-07-23 23:11:42 -07:00
Daniel A. Wozniak	95329acb1e	Fileserver transfers bytes	2018-07-23 13:24:47 -07:00
Gareth J. Greenaway	38a65e8fb3	Fixing test_diskusage_nomatch and test_diskusage_match_regex	2018-07-23 11:02:57 -07:00
Gareth J. Greenaway	6ecca166ff	Updating psutil.disk_partitions to pull in all mounts not just the physical ones. Check to see if the mount point from the configuration ends with a $ (regular expression end of line) if not we add one in to ensure that a simple / does not end up matching all mount points. Updating tests accordingly.	2018-07-23 11:02:57 -07:00
Nicole Thomas	801eae3b8d	Merge pull request #48672 from frogunder/45012 ... add service enabled test	2018-07-23 11:38:48 -04:00
rallytime	ea5c063237	Update old utils paths to use new paths	2018-07-23 11:32:08 -04:00
rallytime	e740d3b208	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/client/ssh/state.py - salt/client/ssh/wrapper/state.py - salt/modules/dockermod.py - salt/modules/npm.py - salt/modules/testinframod.py - tests/integration/modules/test_mac_system.py - tests/integration/modules/test_mac_timezone.py - tests/integration/ssh/test_state.py - tests/integration/states/test_user.py - tests/unit/modules/test_npm.py - tests/unit/states/test_file.py	2018-07-23 11:15:43 -04:00
Alexander Duryagin	ebcd3b1c6b	fixed test for svn.export	2018-07-23 10:58:48 -04:00
Nicole Thomas	ead19725b6	Merge branch '2017.7' into fix_48169	2018-07-20 10:45:59 -04:00
Nicole Thomas	dfc1582475	Merge pull request #48304 from Ch3LL/swap_mac ... Fix macosx grains when swapusage returns comma	2018-07-20 10:30:58 -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
Nicole Thomas	4b16537a29	Merge pull request #48579 from Ch3LL/fix_syslog ... Fix python2 syslog returner expecting string bytes not unicode	2018-07-13 15:50:15 -04:00
Daniel A Wozniak	136ddf5f54	Finally fix prepend for real	2018-07-13 11:25:27 -07:00
Ch3LL	d8288a0ffc	add unicode type for syslog test for tag	2018-07-13 12:39:09 -04:00
Ch3LL	17e69382d5	Fix python2 syslog returner expecting string bytes not unicode	2018-07-13 12:35:41 -04: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
rallytime	8bc71688ea	Remove /sr.* pattern from test ... /sr.* pattern should raise exception	2018-07-12 11:24:44 -04:00
rallytime	5e2e2a63fa	Update file unit tests to handle "writelines" change ... Since file.line is now using "writelines()" instead of "write()", we need to handle the unittests accordingly.	2018-07-12 11:12:22 -04:00
rallytime	d0b6e82ecb	Add 'name' as the passed in filepath for test_line_insert_ensure_before_first_line test ... With 'foo', the test fails with an unknown file KeyError - we need to use the "name" variable instead. Fixes the test_line_insert_ensure_before_first_line test.	2018-07-12 11:11:47 -04:00
rallytime	d8920cb61f	Update test_line_insert_ensure_before_first_line to use new mock_open methodologies	2018-07-12 11:11:32 -04:00
Jerzy Drozdz	adfa3aed0d	Empty match on delete or replace not causing IndexError exception	2018-07-10 09:20:23 -04:00
Jerzy Drozdz	d2af81e9c7	Make integration green. Added test for mode ensure insert before first line	2018-07-10 09:19:55 -04:00
Jerzy Drozdz	3af551ebe1	/sr.* pattern should raise exception	2018-07-10 09:17:49 -04:00
Jerzy Drozdz	935a9b9d56	test_line_insert_end fixed	2018-07-10 09:14:18 -04:00
rallytime	54341d1a8d	Update old utils paths to use new utils paths	2018-07-09 10:34:38 -04:00
rallytime	68aabff0cf	Merge branch '2017.7' into '2018.3' ... Conflicts: - pkg/windows/req.txt - salt/netapi/rest_tornado/saltnado.py - salt/utils/versions.py - tests/integration/states/test_file.py	2018-07-09 10:27:58 -04:00
Nicole Thomas	2baa7f189f	Merge pull request #48431 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-07-05 13:22:59 -04:00
slivik	70144bccbb	Fixes dry run in ini_manage + Fixes related bug - when working with options which are not in section. + Fixes related tests + Fixes pylint warnings	2018-07-04 09:19:36 +02: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
rallytime	3e59dda0b1	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-07-03 16:09:28 -04: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
Nicole Thomas	5b38019ca0	Merge pull request #48339 from terminalmage/backport-tojson-filter ... Backport tojson filter from #48309 to 2018.3	2018-07-02 13:52:52 -04:00
Nicole Thomas	d3c658bdcf	Merge pull request #48358 from Ch3LL/m2crypto_fix ... Fix corrupt public key with m2crypto python3	2018-07-02 09:10:31 -04:00
Daniel A. Wozniak	d3456d31e6	Fix file.symlink state test for windows	2018-06-30 15:44:58 -07:00
rallytime	c4fd2a0930	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/rabbitmq.py - tests/integration/modules/test_pip.py	2018-06-30 09:33:21 -04:00
Ch3LL	8fdd34d430	m2crypto open file in rb mode for pub key	2018-06-29 14:43:06 -04:00
twangboy	77629f640a	Fix module unit tests	2018-06-29 11:15:23 -06:00
Ch3LL	a964db4663	Fix corrupt public key with m2crypto python3	2018-06-28 11:31:21 -04: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
Erik Johnson	c636b18cf0	Add unit test for tojson filter	2018-06-27 12:23:29 -05:00
Ch3LL	5d6135e1e2	Fix macosx grains when swapusage returns comma	2018-06-25 18:03:57 -04:00
rallytime	c7bb8a50b0	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/x509.py - salt/runners/cloud.py - tests/unit/modules/test_state.py	2018-06-25 10:41:06 -04:00
Nicole Thomas	27a0e95174	Merge pull request #48279 from terminalmage/mock_open-docs ... Add documentation/further enhancements to rewritten mock_open	2018-06-25 09:12:29 -04:00
Erik Johnson	830a624ce8	Ignore IOError when tearing down filehandles not opened for reading	2018-06-23 21:28:34 -05:00