15131 Commits

Author	SHA1	Message	Date
twangboy	1650881989	Fix tets_nacl on Py3 ... Move the nacl tests from integration to unit	2018-11-15 13:20:39 -07:00
Nicole Thomas	0327ea0469	Merge pull request #50522 from cbosdo/fluorine-backport ... Test and fix disk creation in virt.init	2018-11-15 09:48:06 -05:00
Cédric Bosdonnat	0786123d03	Test and fix disk creation in virt.init ... Adding a test case in virt.init uncovered a few issues: a passed exception that we really want to report to the user, and disks that were not created.	2018-11-15 10:57:30 +01:00
Ch3LL	8501581f27	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/utils/mac_utils.py - salt/utils/win_runas.py - tests/support/case.py	2018-11-14 12:38:16 -05:00
Nicole Thomas	9e63cde7c5	Merge pull request #50472 from cbosdo/fluorine-backport ... Fix virt.update for NICs mac and model	2018-11-13 16:17:30 -05:00
Mike Place	c1dde7e9b1	Merge pull request #50328 from rallytime/fix-48734 ... Fix issue with salt-run jobs.list_jobs where Target: unknown-target	2018-11-13 12:49:57 -07:00
Nicole Thomas	6b272c1d65	Merge pull request #50492 from rallytime/bp-50228-and-50443 ... Back-port #50228 and #50443 to 2018.3	2018-11-13 11:59:14 -05:00
rallytime	f578392eb4	Lint Fix: add mock_open import	2018-11-13 09:30:02 -05:00
Shea Craig	3c36bddd8a	Fix linting errors.	2018-11-13 09:22:24 -05:00
Shea Craig	fab57de795	Write tests to handle invalid launchd plist XML.	2018-11-13 09:21:58 -05:00
Shea Craig	bb429b0dff	Condense service result assertions, add a binary plist test.	2018-11-13 09:21:58 -05:00
Shea Craig	a809fef417	Factor out another helper function, implement broken symlink test.	2018-11-13 09:21:58 -05:00
Shea Craig	216f7ef864	Update testing for mac_utils services. ... This commit begins to go over the existing testing for mac_utils, applying the updated best-practices from the unit testing section of the Salt docs. Wherever possible, I've tried to keep the data for each test within the test, while factoring out repetitive functions. In this commit, for example, the `os.walk` side_effect func has been factored into its own helper function. This commit begins looking at what is being tested for this module and making it more specific, specifically to test one thing per test (existing tests had multiple asserts and in some casaes were actually malformed such that the tests would pass, but in actual use, code would throw an exception and skip over the block).	2018-11-13 09:21:57 -05:00
Shea Craig	ae6f49b0b1	Make test correctly generate a double exception.	2018-11-13 09:11:18 -05:00
Daniel Wozniak	7dd34386ef	Merge pull request #50456 from terminalmage/issue50218 ... Two bugfixes	2018-11-12 23:06:51 -07:00
Nicole Thomas	cfb33511df	Merge pull request #50483 from rallytime/bp-50272 ... Back-port #50272 to 2018.3	2018-11-12 17:45:05 -05:00
Erik Johnson	0f02da7fec	Remove unnecessary u prefix from string literals ... These are redundant with unicode_literals being used	2018-11-12 16:45:28 -05:00
Erik Johnson	fc26ae8ea3	Add unit test for comparing containers with the same env vars	2018-11-12 16:45:22 -05:00
rallytime	c7ebb7f96d	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-11-12 16:20:41 -05:00
rallytime	1517bb31a8	Update old utils paths to use new paths	2018-11-12 16:13:35 -05:00
rallytime	d8e7c47a05	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/support/case.py	2018-11-12 16:11:17 -05:00
Nicole Thomas	b16ff9cd1c	Merge pull request #50469 from dwoz/minion_timeout_test ... Fix up integration.minion.test_timeout	2018-11-12 11:53:45 -05:00
Erik Johnson	6143408507	Add unit test for TimedProc regression	2018-11-12 09:08:49 -06:00
Cédric Bosdonnat	4b628d2f66	virt.update: only compare NIC properties we handle ... virt.update compares NIC devices to guess if they need to be updated. It needs to allow changing the properties the user is inputing including mac and model. It also should not compare properties we don't handle: that could destroy vlan definitions or other important bits.	2018-11-12 14:12:10 +01:00
Daniel A. Wozniak	794ba17c94	Reset date and time after changing	2018-11-12 00:43:22 -07:00
Daniel A. Wozniak	57f702dc58	Fix linter warning	2018-11-11 21:49:20 -07:00
Daniel A. Wozniak	686153a77c	Fix up integration.minion.test_timeout ... This test wasn't able to be run on it's own. Fix it and add more debugging	2018-11-11 21:30:08 -07:00
Nicole Thomas	c51f3643c2	Merge pull request #50448 from cbosdo/fluorine-backport ... Fix virtual disk creation in update	2018-11-09 10:00:04 -05:00
Nicole Thomas	e6a285c3f6	Merge pull request #50440 from Ch3LL/mac_system_flaky ... Add attempts kwarg in flaky test decorator	2018-11-09 09:53:31 -05:00
Nicole Thomas	081b219912	Merge pull request #50390 from twangboy/fix_test_nacl ... Fix integration.runners.test_nacl on Windows Py3	2018-11-09 09:37:20 -05:00
Nicole Thomas	fe522b2b62	Merge branch 'fluorine' into fluorine-backport	2018-11-09 09:34:13 -05:00
Nicole Thomas	a921df0fb6	Merge pull request #50437 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-11-09 09:33:56 -05:00
Cédric Bosdonnat	819bd6aacd	Fix virtual disk creation in update ... Some disk devices like cdroms may have an empty source_file: handle it or we will fail when testing for the file presence.	2018-11-09 14:10:44 +01:00
Ch3LL	fa0c1b02e1	Add attempts kwarg in flaky test decorator	2018-11-08 16:30:05 -05:00
Mike Place	675a35959a	Merge pull request #50405 from twangboy/fix_test_decorators ... Fix integration.modules.test_decorators for Windows	2018-11-08 10:23:42 -07:00
Mike Place	73ce80f6e3	Merge pull request #50417 from meaksh/2018.3-fix-git_pillar-__env__-solving-for-merging ... Get the right target when using "__env__" on git ext_pillar to avoid merging problems	2018-11-08 10:07:02 -07:00
rallytime	b86ad94fb1	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/master.py - salt/transport/tcp.py	2018-11-08 10:44:10 -05:00
rallytime	2c51cf9816	Make target test job more specific to reduce test flakiness	2018-11-08 10:27:41 -05:00
Cédric Bosdonnat	55823cb3a4	virt.update: create missing disk images ... When running virt.update to add new virtual disks, the disks are defined, but the actual image is not created. Use the same function than virt.init to implement this.	2018-11-08 15:44:48 +01:00
Cédric Bosdonnat	040bf4a39c	Fix virt.pool_info usage in virt.update ... pool_info was changed to return a dict of pool infos even for a single pool search. Adapt calls of it in the virt module.	2018-11-08 15:44:48 +01:00
Gareth J. Greenaway	469c090330	Adding a check to see if the config file exists, if not then return an empty list so we get the would be changes. Adding a test for this functionality.	2018-11-07 15:50:17 -08:00
rallytime	caace3f184	Rewrite job cache target test to be more robust	2018-11-07 17:01:06 -05:00
Pablo Suárez Hernández	71af32d31a	Remove unicode references	2018-11-07 16:55:55 +00:00
Pablo Suárez Hernández	b7af5e52c5	Test git ext_pillar across multiple repos using __env__	2018-11-07 16:33:03 +00:00
twangboy	3e0803c588	Fix integration.modules.test_decorators for Windows ... Adds a exit_code.cmd file for Windows Uses `posix=True` for shlex_split on Windows	2018-11-06 16:17:39 -07:00
Mike Place	c2fda9dd9c	Merge pull request #50383 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-11-06 08:51:52 -07:00
twangboy	0abb9e1842	Fix integration.runners.test_nacl on Windows Py3 ... Fixes failing tests on Windows on Py3 nacl.py - The keys have to be strings - Removes redundant `to_bytes` code in the enc and dec functions - Removes unnecessary if statement test_nacl.py - The compare data needs to be bytes	2018-11-05 17:18:17 -07:00
Mike Place	333a133f83	Merge pull request #50385 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-11-05 13:51:16 -07:00
Mike Place	cf14408a49	Merge pull request #50362 from twangboy/fix_test_matcher ... Fix test_matcher on Windows	2018-11-05 12:36:52 -07:00
Mike Place	369886aa28	Merge pull request #50365 from twangboy/fix_test_manage ... Fix `integration.runners.test_manage` on Windows	2018-11-05 12:35:55 -07:00