11417 Commits

Author	SHA1	Message	Date
Bo Maryniuk	c7a1b733ab	Add scaffold for the unit test	2017-11-10 20:02:04 +01:00
Bo Maryniuk	b2ed7d0ecd	Mute pylint on misdetected regex-like strings that are actually just test data.	2017-11-10 19:50:47 +01:00
Bo Maryniuk	40f1e1d954	Rewrite unit tests for file.line on delete/replace an empty line	2017-11-10 19:50:47 +01:00
Bo Maryniuk	c2d9d8f8ea	Add unit test for file.line ensuring line between two lines but content already exists	2017-11-10 19:50:47 +01:00
Bo Maryniuk	9963895719	Add unit test for file.line ensuring line inside the range of lines	2017-11-10 19:50:47 +01:00
Bo Maryniuk	1e1f5e5a6f	Add unit test for file.line ensuring line between two other lines nearby	2017-11-10 19:50:47 +01:00
Bo Maryniuk	59de17b260	Add unit test for file.line on calling insert/ensure after specific line	2017-11-10 19:50:47 +01:00
Bo Maryniuk	710481b25e	Add unit test for file.line when calling insert/ensure mode	2017-11-10 19:50:47 +01:00
Bo Maryniuk	b42b762c57	Add unit test for file.line when inserting a line at the end of the file (append functionality)	2017-11-10 19:50:46 +01:00
Bo Maryniuk	80c40bbb11	Remove irrelevant issue number	2017-11-10 19:50:46 +01:00
Bo Maryniuk	c95b3e031c	Add unit test about file.line for insert/start	2017-11-10 19:50:46 +01:00
Bo Maryniuk	926372574d	Remove irrelevant issue number from the docstring	2017-11-10 19:50:46 +01:00
Bo Maryniuk	b4cd4bd165	Add unit test for file.line replacement	2017-11-10 19:50:46 +01:00
Bo Maryniuk	9a72761dc6	Add unit test for file.line delete by direct match or regular expression	2017-11-10 19:50:46 +01:00
Bo Maryniuk	60185f578e	Add unit test for file.line usage together with before/after	2017-11-10 19:50:46 +01:00
Bo Maryniuk	fc79a546dd	Rename unit test	2017-11-10 19:50:46 +01:00
Bo Maryniuk	d1a41dd7bd	Add unit test file.line insert before line	2017-11-10 19:50:46 +01:00
Bo Maryniuk	1ea7e33605	Harden unit test for 'after pattern' scenario	2017-11-10 19:50:46 +01:00
Bo Maryniuk	bde3611f08	Remove unnecessary code	2017-11-10 19:50:46 +01:00
Bo Maryniuk	fdffbe47b0	Add unit test for using patterns for line matching	2017-11-10 19:50:46 +01:00
Bo Maryniuk	ed171176a8	Rename unit test while using no patterns	2017-11-10 19:50:46 +01:00
Bo Maryniuk	d08307f53b	Add unit test for file.line insert=after	2017-11-10 19:50:46 +01:00
Bo Maryniuk	39126da5a2	Update unit test data	2017-11-10 19:50:46 +01:00
Bo Maryniuk	47fbe03c14	Add unit test for file._starts_till function	2017-11-10 19:50:46 +01:00
Bo Maryniuk	599310e684	Fix docs for skipif decorator	2017-11-10 19:50:46 +01:00
Bo Maryniuk	d5d653af45	Add unit test for file.line on no location/before/after check failure	2017-11-10 19:50:46 +01:00
Bo Maryniuk	5b76c41f44	Move all file.line unit tests to the own class	2017-11-10 19:50:46 +01:00
Bo Maryniuk	f0f08a10e8	Add unit test for file.line on an empty content while not deleting anything	2017-11-10 19:50:46 +01:00
Bo Maryniuk	b5a80231bd	Rename a unit test and clarify its purpose in docs	2017-11-10 19:50:46 +01:00
Bo Maryniuk	cf191b01d6	Add unit test for file.line on mode checks	2017-11-10 19:50:46 +01:00
Nicole Thomas	5505a8819a	Merge branch '2017.7' into win_unit_test_archive	2017-11-10 11:48:51 -07:00
Mike Place	8b834e341d	Merge pull request #44288 from eradman/onlyif_unless ... Report 'onlyif' and 'unless' conditions as true or false	2017-11-10 11:37:01 -07:00
Ch3LL	e952cd6712	Enable test_deploy ssh test	2017-11-10 13:35:13 -05:00
twangboy	6c872e95e6	Add back the setup_loader_modules function ... Use empty dict instead of defining wmi	2017-11-10 11:30:00 -07:00
Erik Johnson	20273e3697	No need for setup_loader_modules since we're actually importing wmi	2017-11-10 11:29:59 -07:00
twangboy	8c107873cd	Remove wmi monkeypatching ... The WMI object was being monkey patched in the global namespace causing other tests to fail	2017-11-10 11:29:54 -07:00
Mike Place	cc08ad2edc	Merge pull request #44317 from Ch3LL/ssh_test ... Add state tests and state request system to salt-ssh	2017-11-10 11:28:42 -07:00
Nicole Thomas	9302149604	Merge branch 'develop' into develop	2017-11-10 10:56:12 -07:00
Nicole Thomas	0a8419358b	Merge branch 'develop' into separate-key-dir-from-cache-dir	2017-11-10 10:39:53 -07:00
Nicole Thomas	9fb9fecfa7	Merge branch 'develop' into 42713_mine.get_back_compat	2017-11-10 10:06:11 -07:00
Ch3LL	f3ec6df76e	Add orchestration tests when target exists or not	2017-11-10 12:00:12 -05:00
Ch3LL	46bce3bd5e	add additional parser argument for ssh integration tests	2017-11-10 10:58:38 -05:00
Ch3LL	e9231430b5	remove logic similar to cloud/proxy tests	2017-11-10 10:48:31 -05:00
Ch3LL	c731eb8ea6	add ssh dir to test runner when --ssh-tests set	2017-11-10 10:48:31 -05:00
Ch3LL	8089a885c2	add wipe function to other run_ssh method	2017-11-10 10:48:31 -05:00
Ch3LL	e3ebb5e9b3	fix comment and variables	2017-11-10 10:48:30 -05:00
Ch3LL	faef0886a7	Add state tests and state request system to salt-ssh	2017-11-10 10:48:30 -05:00
Ch3LL	12fed1b4d8	Add integration pillar command line test	2017-11-10 10:43:37 -05:00
rallytime	9fcc2a70b5	Merge branch '2016.11' into '2017.7' ... Conflicts: - tests/unit/modules/test_rh_ip.py	2017-11-10 10:33:25 -05:00
twangboy	0a9e862bf4	Use regex to split	2017-11-09 16:24:19 -07:00
twangboy	b1dfe9c3c8	Format patching with statements for easier reading	2017-11-09 14:32:21 -07:00
twangboy	ba2f2eb788	Add Erik's changes	2017-11-09 14:32:21 -07:00
twangboy	4ef1e3eb97	Fix unit.states.test_archive for Windows ... Use os agnostic paths Mock `salt.utils.which` for Windows Handle urlparse return on Windows	2017-11-09 14:32:21 -07:00
Erik Johnson	c1b6d35c0c	Python 3 compatibility fixes for kubernetes ... dict.keys() is not a list in Python 3, and base64.b64encode requires a bytestring.	2017-11-09 15:05:43 -06:00
Erik Johnson	b6ccfb45c8	Wait until after restoring original resource limit before removing temp files ... Invoking shutil.rmtree() first was causing a traceback since the max open files setting was still set very low for the test. This moves the shutil.rmtree() until after we have restored the original resource limit.	2017-11-09 15:05:43 -06:00
Erik Johnson	8a7d56369c	Use with blocks (or try/finally) to ensure filehandles are closed ... This fixes a few sources (or potential sources) of filehandle leaks.	2017-11-09 15:05:40 -06:00
Gareth J. Greenaway	7cdf703884	Updating tests for watch_any_fail and require_any_fail.	2017-11-08 16:06:44 -08:00
Gareth J. Greenaway	4dbd3e5567	Updating unit tests to limit to two required states.	2017-11-08 16:06:44 -08:00
Gareth J. Greenaway	efbfa5abf2	Adding state file used in integration tests.	2017-11-08 16:06:44 -08:00
Gareth J. Greenaway	58d22a169c	Adding docs and integration tests.	2017-11-08 16:06:43 -08:00
Gareth J. Greenaway	3ffab16a4d	If a state is in prerequired, do not add to the self.pre to the list of requirements.	2017-11-08 16:06:43 -08:00
Gareth J. Greenaway	d9dcb84fe3	tweaking	2017-11-08 16:06:43 -08:00
Gareth J. Greenaway	d2bfa95018	Merging in watch_any changes	2017-11-08 16:06:43 -08:00
Nicole Thomas	2bf0df89cd	Merge pull request #44403 from eradman/swap_total ... Implement swap_total grain on OpenBSD	2017-11-08 14:48:45 -07:00
Erik Johnson	5932e8a8ae	Merge pull request #44407 from rallytime/merge-develop ... [develop] Merge forward from 2017.7 to develop	2017-11-08 11:50:05 -08:00
Eric Radman	26417d8e83	Add integration test for (mem|swap)_total grains on OpenBSD	2017-11-08 14:38:20 -05:00
Ch3LL	5d1a9af4b5	Add salt-ssh grains.items test	2017-11-08 13:41:11 -05:00
Gareth J. Greenaway	df937bf2fa	Merge branch 'develop' into 43647_fix_InitiatorName_in_comments	2017-11-08 10:58:22 -07:00
Georges Racinet	5c01c74fbc	Merge branch 'develop' of github.com:saltstack/salt into 42713_mine.get_back_compat ... ... and fixed conflict	2017-11-08 18:09:04 +01:00
Georges Racinet	728c9b65a5	Unit test for backwards compatibility of mine.get ... Could not find calls to RemoteFuncs in unit tests, therefore started a new one, hope it's in the appropriate place. The test replaces the caceh by its own (very limited) one. It's quite possible it could be improved by reusing another one meant for unit tests.	2017-11-08 18:02:29 +01:00
Nicole Thomas	8ffe91fe44	Merge pull request #44405 from SEJeff/kubernetes-updates-v2 ... Kubernetes updates v2	2017-11-07 12:17:43 -07:00
Jorge Schrauwen	3af235250d	Remove _zpool_data from the bsd_memdata test for grains	2017-11-07 08:17:50 +01:00
Nicole Thomas	c03e997144	Merge pull request #44246 from nicholasmhughes/add-location-to-file.line-ensure ... Add location support to file.line ensure	2017-11-06 22:35:18 -07:00
Sean Jenkins	ed8cccf457	#39901: Fix pylint	2017-11-06 17:02:53 -07:00
Sean Jenkins	43c81dfdee	#39901: Add unit tests	2017-11-06 15:04:22 -07:00
rallytime	f26beffe48	Update old utils paths to new paths	2017-11-05 20:39:40 -07:00
rallytime	2c052e34b3	Merge branch '2017.7' into 'develop' ... Conflicts: - .gitignore - salt/modules/win_lgpo.py - salt/utils/__init__.py - tests/integration/spm/test_build.py - tests/unit/test_pydsl.py	2017-11-05 20:28:51 -07:00
Jeff Schroeder	eaaa4dcf8e	Up the total test coverage of the kubernetes state to 54%! ... * Add 100% test coverage for the kubernetes.node_label_absent state * Add 100% test coverage for the kubernetes.namespace_present state * Add 100% test coverage for the kubernetes.namespace_absent state	2017-11-05 20:11:25 -06:00
Jeff Schroeder	2b44f7ca85	Small formatting fixup	2017-11-05 20:11:17 -06:00
Jeff Schroeder	7039d74e90	More kubernetes state tests ... * Add 100% test coverage for the kubernetes.secret_absent state * Add 100% coverage for kubernetes.node_label_present * Also add 'comment' to kubernetes.node_add_label * Make the faux test objects more believable in test_kubernetes.py	2017-11-05 17:57:29 -06:00
Jeff Schroeder	2b02a46544	Add the beginning of tests for states.kubernetes and update things ... * Add 100% test coverage for the kubernetes.secret_present state * Add 100% test coverage for the kubernetes.configmap_absent state * Add 100% test coverage for the kubernetes.configmap_present state * Make some fields optional to kubernetes.create_secret and add examples * Make some fields optional to kubernetes.replace_secret and add examples * Make some fields optional to kubernetes.create_configmap and add examples * Make some fields optional to kubernetes.replace_configmap and add examples * Add 'comment' when a kubernetes configmap or secret is going to be replaced * Update 'source', 'template', and 'saltenv' kwargs to defaults from the rest of the codebase * Allow passing empty 'data' to the kubernetes.configmap_present state to remove the existing contents	2017-11-05 13:34:37 -06:00
Mike Place	1412a42f0e	Merge pull request #44070 from gtmanfred/kitchen ... begin adding kitchen-salt into the test suite	2017-11-02 15:55:33 -06:00
Benedikt Werner	4a63798e84	Fixed linting	2017-11-01 01:01:22 +01:00
Ch3LL	952c6bfea4	Include file size check for test_spm_build_big_file test	2017-10-31 18:18:37 -04:00
Benedikt Werner	7bb85f417f	Merge branch 'develop' into develop	2017-10-31 23:15:03 +01:00
Mike Place	c46490c183	Merge pull request #44190 from prymitive/postgres_extension ... Fix test=true checks so that state runs in test mode don't report cha…	2017-10-31 11:53:06 -06:00
Mike Place	57705b9e6a	Merge pull request #44231 from SEJeff/kubernetes-stuff ... Kubernetes module updates round one	2017-10-31 11:21:28 -06:00
Gareth J. Greenaway	06080612bc	Merge branch 'develop' into 43647_fix_InitiatorName_in_comments	2017-10-30 17:54:57 -04:00
Daniel Wallace	947bb86695	comment wordpress module	2017-10-30 13:34:28 -06:00
Daniel Wallace	2659b8b03e	remove pypi.c7 from tests	2017-10-30 13:05:35 -06:00
Nicole Thomas	835e6714ae	Merge branch 'develop' into publish_refactor_use_check_authentication	2017-10-30 11:06:59 -04:00
Nicole Thomas	716aabc0bf	Merge branch '2017.7' into service_test	2017-10-29 11:32:33 -04:00
Ch3LL	dd5c823210	remove skipIf import	2017-10-27 15:01:32 -04:00
rallytime	6d2490f6a0	Fix lint failure on 2017.7 branch	2017-10-27 13:03:01 -04:00
Nicole Thomas	9fc7fde8d2	Merge pull request #43885 from garethgreenaway/43825_swap_total_grain ... [develop] Adding swap_total to core grains	2017-10-27 13:01:11 -04:00
Nicole Thomas	b2b0c770a4	Merge pull request #44279 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-10-27 12:17:18 -04:00
Erik Johnson	bd5b9dd0aa	Merge pull request #44291 from Ch3LL/pillar_test ... add saltutil.refresh_pillar test	2017-10-27 10:19:42 -05:00
Erik Johnson	17d8e46abf	Merge pull request #44277 from rallytime/merge-develop ... [develop] Merge forward from 2017.7 to develop	2017-10-27 10:16:00 -05:00
Nicole Thomas	cf77a6bf0f	Merge pull request #43754 from spenceation/panos-2017-9-26 ... Update to PANOS modules.	2017-10-27 10:36:02 -04:00
Jeff Schroeder	1576c9980c	Fix test_kubernetes.py after fixing bug in 25f7c4996730a578b7875e924508a5c1774e8b7c	2017-10-26 18:20:49 -05:00
Jeff Schroeder	9304a428e3	Add the change-cause annotation to kubernetes created objects ... This allows commands such as `kubectl rollout history deploy/$FOO` to automatically show the deployment changed as a result of the salt run and follows exactly how kubectl works when passed the `--record` flag.	2017-10-26 18:20:41 -05:00
Jeff Schroeder	9ceabf29f4	Fix kubernetes.node_labels() ... This prevented showing, adding, or removing any labels from nodes	2017-10-26 18:20:34 -05:00
Jeff Schroeder	ac20ddfa25	Fix a bug in the kubernetes module for ssl cert paths ... When the `client_key_file` attribute was defined and the `client_key` attribute was not, the conditional for `client_key` would wrongly zero `kubernetes.client.configuration.key_file`. This was a bit annoying to figure out, but the kubernetes module now can authenticate with minikube with a configuration such as this (where jeff is $USER): kubernetes.api_url: 'https://192.168.99.100:8443' kubernetes.certificate-authority-file: '/home/jeff/.minikube/ca.crt' kubernetes.client-certificate-file: '/home/jeff/.minikube/client.crt' kubernetes.client-key-file: '/home/jeff/.minikube/client.key' The various options can be gotten from ~/.kube/config after running `minikube start`.	2017-10-26 18:20:28 -05:00
Nicole Thomas	e16707c403	Merge pull request #44285 from Ch3LL/all_spm ... add spm integration tests for remove and build	2017-10-26 17:20:09 -04:00
Ch3LL	ff92f31cbe	remove skipif for docker	2017-10-26 14:43:31 -04:00
twangboy	6db23757bc	Fix test_pydsl on Windows ... Fix salt.utils.fopen to handle the 't' mode correctly in Windows Fix the test_pysl test issues with spacing and file paths	2017-10-26 10:18:07 -06:00
Ch3LL	c13f37eee4	change service name depending on os	2017-10-26 11:44:38 -04:00
Ch3LL	1f77f3e6a3	add skipif logic for fallocate cmd	2017-10-26 10:09:33 -04:00
Ch3LL	34e2955445	add saltutil.refresh_pillar test	2017-10-25 15:56:49 -04:00
rallytime	8237f45a46	Add print_function to __future__ import list	2017-10-25 14:54:03 -04:00
Ch3LL	980c43ebc9	change skip message check to docker	2017-10-25 13:43:13 -04:00
Ch3LL	3955537609	change skip if check to docker	2017-10-25 13:40:58 -04:00
Ch3LL	aa8875a0e2	change service name to docker	2017-10-25 13:39:46 -04:00
Ch3LL	03b5c4bc6d	add spm integration tests for remove and build	2017-10-25 12:09:51 -04:00
Ch3LL	0a387c2ecd	fix pylint	2017-10-25 12:08:29 -04:00
Ch3LL	f383f05a93	Add SPM create_repo integration test	2017-10-25 12:06:08 -04:00
rallytime	055b0701de	Lint fix from sloppy merge conflict resolution	2017-10-25 11:58:44 -04:00
Eric Radman	d921e1e6cb	Report 'onlyif' and 'unless' conditions as true or false ... Elide terminology "execution failed/succeeded" since the result of these conditions does not indicate a failure in state execution. Instead simply report the result of each condition.	2017-10-25 11:03:13 -04:00
rallytime	1c3cb5c6a4	Merge branch '2016.11' into '2017.7' ... Conflicts: - .gitignore - tests/unit/states/test_file.py	2017-10-25 10:04:08 -04:00
rallytime	8a1c575ae5	Update salt.utils.fopen calls to new salt.utils.files.fopen path	2017-10-25 09:59:04 -04:00
rallytime	28343f0120	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/modules/git.py	2017-10-25 09:54:37 -04:00
Mike Place	bd75be24ca	Merge pull request #44253 from Ch3LL/spm_install ... Add multiple spm integration tests	2017-10-25 15:36:02 +02:00
Mike Place	75ee1ebc50	Merge pull request #44254 from twangboy/win_fix_test_win_groupadd ... Fix `unit.modules.test_win_groupadd` for Windows	2017-10-25 15:33:39 +02:00
Ch3LL	e5701b472d	Add state, grains and service proxy tests	2017-10-24 16:59:56 -04:00
Ch3LL	654071028b	change service to crond	2017-10-24 16:26:31 -04:00
Ch3LL	7911b4b3eb	Add service.status integration test	2017-10-24 16:25:19 -04:00
Daniel Wallace	56a3ad8f68	fix pylint comments	2017-10-24 12:18:27 -06:00
Daniel Wallace	4add666db1	add comment to Gemfile and move copyartifacts ... moved copyartifacts.py to tests/support Also added a comment to the Gemfile that this is only used to run the testsuite with kitchen-salt	2017-10-24 12:01:57 -06:00
Daniel Wallace	b4c8f7eb57	fix pylint	2017-10-24 10:44:25 -06:00
Daniel Wallace	1b8bd64a88	Merge branch 'develop' into develop	2017-10-24 10:42:22 -06:00
twangboy	609361bf48	Fix some lint errors	2017-10-24 09:27:39 -06:00
twangboy	7a3ff9387d	Mock the rest of the tests	2017-10-24 09:27:38 -06:00
Erik Johnson	5ce14df82c	Change how members are retrieved in win_groupadd ... This is a solution that works for the other functions that interact with group objects, making it a better overall solution to be used widely in win_groupadd. This also updates the mocking in the tests such that we use a more comprehensive fake class, and more intelligent mocking of get_sam_name using a lambda.	2017-10-24 09:27:38 -06:00
twangboy	6ab82394be	Set up mocking ... Move the code that sets up the group object, computer object and gets existing members out of the individual functions so they can be mocked Mock the GroupObj Mock the ComputerObj Mock existing members Still need to fix info, getent, and members	2017-10-24 09:27:37 -06:00
Daniel Wallace	79251287d0	add logging	2017-10-24 09:23:46 -06:00
Daniel Wallace	38963d5a82	use transport if not set in state_file	2017-10-24 09:23:46 -06:00
Daniel Wallace	7465f9b27a	add script for copying back artifacts	2017-10-24 09:23:46 -06:00
Ch3LL	9e2e785034	add spm tests to test runner	2017-10-24 10:33:53 -04:00
Sol Kim	af2d6a0441	Merge branch 'develop' into separate-key-dir-from-cache-dir	2017-10-24 11:00:19 +09:00
Łukasz Mierzwa	58b84c7f71	Fix test case when postgres extension is already present and test=true is passed ... Currently test expects that if the extension is already present salt will indicate that it will create it (which won't really happen without test=true since the extension is present), state was fixed so now salt will return correct information with test=true so fix the test to follow correct behaviour.	2017-10-23 17:48:27 -07:00
Ch3LL	4729ccd32b	Add multiple spm integration tests	2017-10-23 17:13:32 -04:00
Nicole Thomas	4278a08e40	Merge pull request #44194 from vernondcole/saltify-create-with-wake-on-lan ... add wake-on-LAN feature to saltify create	2017-10-23 10:46:21 -04:00
nicholasmhughes	fa1c442943	added support for location in file.line when using ensure	2017-10-23 10:40:35 -04:00
Nicole Thomas	304dd2529d	Merge pull request #44160 from gtmanfred/directory ... add changes to test return	2017-10-23 10:35:20 -04:00
Nicole Thomas	2ccfaca66c	Merge pull request #44067 from eradman/check_file_meta ... Check file attributes if lsattr(1) is installed	2017-10-23 10:30:58 -04:00
Erik Johnson	96891a062a	Merge pull request #44203 from rallytime/merge-develop ... [develop] Merge forward from 2017.7 to develop	2017-10-23 09:11:54 -05:00
Nicole Thomas	7374403eca	Merge pull request #44225 from eradman/test_btmp_wtmp ... Mock open on /var/log/btmp and /var/log/wtmp	2017-10-23 09:51:46 -04:00
Eric Radman	10d13062ec	Mock open to /var/log/btmp and /var/log/wtmp ... - btmp may not exist - wtmp may not exist, or it may not contain ASCII data Unbreaks tests on OpenBSD 6.2	2017-10-21 09:50:08 -04:00
Roald Nefs	f430e1e33c	Added simple test for Telegram returner	2017-10-20 20:55:54 +02:00
Nicole Thomas	012477071f	Merge pull request #44071 from garethgreenaway/various_beacon_fixes ... [develop] Various fixes to beacons	2017-10-20 11:06:27 -04:00