15150 Commits

Author	SHA1	Message	Date
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
Gareth J. Greenaway	039f3d1622	Increase limit for trimming.	2018-11-05 11:22:20 -08:00
twangboy	b0341ea7dc	Remove flaky test	2018-11-05 12:15:06 -07:00
rallytime	a02564c7c0	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/utils/win_dacl.py	2018-11-05 14:06:42 -05:00
Gareth J. Greenaway	7f77bfef99	Adding test for utils/dicttrim.py	2018-11-05 10:58:36 -08:00
rallytime	e993692d01	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/master.py - salt/transport/tcp.py - salt/transport/zeromq.py - tests/integration/cli/test_batch.py	2018-11-05 12:54:30 -05:00
Cédric Bosdonnat	f9b6171aed	virt: fix disk targets before diffing ... Ensure the disk target devices are unique within the disks in the new list before diffing them. Libvirt will reorder the disks based on their targets. If the users gives a disk order that is not consistent with the currently running VM, then it's his fault giving us wrong data.	2018-11-05 17:07:45 +01:00
Cédric Bosdonnat	a75dcb3e9e	virt: introduce disk device type ... Disk devices can be of several types and we need to handle them in order to update existing VMms with floppy or cdrom devices. cdrom devices are particularly interesting since they can also have no source.	2018-11-05 17:05:55 +01:00
Cédric Bosdonnat	9099179b7a	Virt: VM disk source may not be specified ... Disks like cdroms have no source element. We need to handle iit in the disks comparison or we'll have exceptions when updating VMs that haven't been generated by salt virt module.	2018-11-05 17:04:48 +01:00
Nicole Thomas	c29f9d23a5	Merge pull request #50342 from Ch3LL/fix_unless_onlif_mac ... Fix test_issue_30161_unless_and_onlyif_together for MacOSX	2018-11-05 09:22:21 -05:00
Nicole Thomas	3022b7db5b	Merge pull request #50347 from garethgreenaway/41342_beacon_state_module_fixes ... [2018.3] Fixes to beacon state module	2018-11-05 09:19:40 -05:00
Nicole Thomas	f560570e84	Merge pull request #50368 from twangboy/fix_test_standard ... Fix `integration.client.test_standard` on Windows	2018-11-05 08:58:19 -05:00
twangboy	9858c4d792	Fix some lint	2018-11-03 10:53:49 -06:00
twangboy	c5a9af7fbe	Increase timeout	2018-11-02 18:21:35 -06:00
Daniel A. Wozniak	18b5d43d09	Increase cli batch test timeout for increased reliablity	2018-11-02 17:15:31 -07:00
twangboy	6948274c25	Add some timeouts	2018-11-02 17:11:50 -06:00
twangboy	d968b7df0a	Adds timeouts to the manage.down runner ... Passes timeouts to the runner from the test	2018-11-02 16:17:36 -06:00
twangboy	b4b0a71a0f	Fix test_matcher on Windows ... Fixes a timeout issue in test_salt_documentation_arguments_not_assumed	2018-11-02 14:30:31 -06:00
Gareth J. Greenaway	b8ded8bf5f	Updating the swap function in the mount.swap function also check the device name when checking the fstab data. Updating tests to reflect new behavior.	2018-11-02 12:23:24 -07:00
Gareth J. Greenaway	8885d1ff3d	Merge branch '2018.3' into 41342_beacon_state_module_fixes	2018-11-02 12:08:19 -07:00
Antonio Jordan	f7041285d5	fixing type in load beacon module and adding option validators to config check function along with mock default values in test, fixes #48343	2018-11-02 18:52:12 +00:00
Antonio Jordan	4114a4f5d8	fixing type in load beacon module and adding option validators to config check function along with mock default values in test	2018-11-02 18:22:55 +00:00
lomeroe	0e011ad805	add runTest method to class for PY2	2018-11-02 08:03:43 -05:00
lomeroe	377ec095ab	add a test for #47784	2018-11-02 08:03:43 -05:00
lomeroe	0a14505e21	change backslashes in comment string to fix lint error	2018-11-02 08:03:43 -05:00
lomeroe	02181d385a	add fix/test for #50079 ... ADML display names that have a single match in each Computer/User policy would not work with the "short" display name, requiring either the "long" name or the explicit policy name	2018-11-02 08:03:43 -05:00
lomeroe	05f29511a4	more lint fixes	2018-11-02 08:03:43 -05:00
lomeroe	94b33350a8	lint fixes in test	2018-11-02 08:03:43 -05:00
lomeroe	2a79626538	update test to actually work ... update lgpo module to catch another possible case of multiple ADML names	2018-11-02 08:03:43 -05:00
lomeroe	42840ecd9b	add missing comma in function call	2018-11-02 08:03:43 -05:00
lomeroe	c283f50074	Log a warning message instead of an exception when a SID cannot be ... converted to a username (for user rights assignments) Add a module test file	2018-11-02 08:03:43 -05:00
Brett Benassi	346a8317b1	Updating the AMI's and sizes for the test run.	2018-11-01 19:05:49 -06:00
Gareth J. Greenaway	c2354a9cb1	Fixing beacon state test. Adding a reset function to beacon module to clear out beacon configuration. Useful for tests runs to ensure bits are left over between runs.	2018-11-01 16:47:02 -07:00
Gareth J. Greenaway	2390f471ce	Adding SaltReturnAssertsMixin back in	2018-11-01 15:22:18 -07:00
Gareth J. Greenaway	677d0908fd	Remove zookeeper reference.	2018-11-01 15:05:42 -07:00
Gareth J. Greenaway	f3dee43bf0	Updating the beacon state module to ensure that the format of the beacon data that is being sent along to the beacon execution module is in the right format.	2018-11-01 15:02:21 -07:00
Ch3LL	4002a7c317	Fix test_issue_30161_unless_and_onlyif_together for MacOSX	2018-11-01 14:31:22 -04:00
Mike Place	51e333ada2	Merge pull request #50316 from rallytime/bp-50301 ... Back-port #50301 to 2018.3	2018-11-01 17:32:04 +01:00
Anthony Shaw	529687a855	update test assertions	2018-11-01 08:41:53 +11:00
rallytime	b29fcfabbb	New test must be py3 compatible...oops. :)	2018-10-31 12:52:58 -04:00
rallytime	6859e0e6e2	Add regression test for issue #48734	2018-10-31 12:03:14 -04:00
twangboy	5fe46d22f9	Un-fix path seperators for Windows	2018-10-30 16:04:29 -06:00
Anthony Shaw	ba526ad149	remove unused import	2018-10-30 14:38:22 -04:00
Anthony Shaw	220e57f848	create 2 simple unit tests for the netyang state module and fix issue in #47425	2018-10-30 14:38:22 -04:00
Anthony Shaw	20bf3067b9	reproduce bug in 47425	2018-10-30 14:38:22 -04:00
Nicole Thomas	f652633241	Merge pull request #50312 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-10-30 13:45:29 -04:00
Nicole Thomas	3f4a4bccc9	Merge pull request #50256 from garethgreenaway/porting_50216_to_fluorine ... [fluorine] Porting #50216 to fluorine	2018-10-30 12:28:49 -04:00
Nicole Thomas	1aae681229	Merge branch '2018.3' into bp-50230	2018-10-30 12:26:15 -04:00
rallytime	77b4379a99	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/modules/aptpkg.py - tests/integration/cloud/clouds/test_ec2.py	2018-10-30 12:23:39 -04:00
rallytime	381a59d56e	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/states/pip_state.py - tests/integration/cloud/clouds/test_ec2.py	2018-10-30 11:41:18 -04:00
rallytime	f23852207f	Fix matcher grain file ... This was inadvertently changed in th filename_map backport. This commit restores the matcher grain file to match all branches previous to the inadvertent change.	2018-10-30 09:51:51 -04:00
Daniel Wallace	9746b894f1	mark ansiblegate test as flaky	2018-10-29 19:40:58 -05:00
Nicole Thomas	0fc090f6b4	Merge pull request #50285 from cbosdo/fluorine-backport ... virt disk fixes for fluorine	2018-10-29 20:28:44 -04:00
Brett Benassi	80982ada82	Removing an un needed change and maybe fixing the lint error	2018-10-29 15:30:51 -06:00
rallytime	1ef712a178	Add various ssh tests to the filemap for salt/utils/vt.py changes ... Some of the salt-ssh tests use the salt/utils/vt.py functions. A recent change in that file caused about 90 tests to start failing on the branch. We need to make sure these tests run when changes to the vt.py util are made in PRs.	2018-10-29 16:40:23 -04:00
rallytime	d6af1bb8d7	Remove the test_custom_grains integration file ... This file has been renamed for the filename_map functionality.	2018-10-29 16:02:35 -04:00
rallytime	274697d0b3	Remove the test_saltclass_list_expasion unit test file ... The tests contained in this file have been moved to the test_saltclass unit test file. This is necessary for filename_map to work correctly.	2018-10-29 15:53:11 -04:00
rallytime	0d23e5aa16	Remove test_pgjsonb_return unit test file ... This file has been renamed for the filename_map functionality.	2018-10-29 15:51:32 -04:00
rallytime	2c6078613b	Remove beacon unit tests that end with *_beacon.py ... These have all been renamed for the filename_map functionality.	2018-10-29 15:49:11 -04:00
Daniel Wallace	fb43061cb1	fix test	2018-10-29 14:45:23 -05:00
Daniel Wallace	5eb0e37f4e	add extra space to localemod test	2018-10-29 14:31:36 -05:00
Nicole Thomas	10ba8b42a8	Merge pull request #50276 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-10-29 15:05:14 -04:00
Nicole Thomas	0f1dc08d41	Merge pull request #50282 from twangboy/fix_test_diskusage ... Fix `unit.beacons.test_diskusage` on Windows	2018-10-29 14:37:12 -04:00
Cédric Bosdonnat	ce1288e437	virt: changing disk bus should update it in the VM ... So far two disks are considered equal if they have the same source file. When a user only wants to change the disk bus, then the disk comparison algorithm will consider it unchanged. Now disks are compared on source and target bus. The other disk variables can be left out side the target device is computed.	2018-10-29 18:06:34 +01:00
Cédric Bosdonnat	7c91803d73	virt: expose source_file disk property to user ... User may want to update or create a VM with a disk image created or provided by a third party tool. In order to do this, let the user set a source_file property to the disk. Thus a {'name': 'myimage', 'source_file': '/path/to/image'} disk will just use the provided disk image.	2018-10-29 18:06:27 +01:00
rallytime	96a225d501	Revert "Remove saltclass pillar unit test for list expansion" ... This reverts commit 85a9395c2a.	2018-10-29 13:05:09 -04:00
rallytime	086371f567	Revert "Remove pgjsonb returner unit tests" ... This reverts commit ab4a670ff2.	2018-10-29 13:03:40 -04:00
rallytime	4e930a0fed	Revert "Remove "test_custom" from grains section of filename_map" ... This reverts commit 68ab3eef55.	2018-10-29 13:03:27 -04:00
rallytime	fffe689f98	Revert "Remove test_error from scheduler tests" ... This reverts commit 68146983cb.	2018-10-29 13:03:12 -04:00
rallytime	ff9e5f9b25	Revert "Remove test files for beacons that don't exist in 2018.3" ... This reverts commit dfa05b978e.	2018-10-29 12:58:25 -04:00
rallytime	3f2712fbc1	Merge branch '2018.3' into 'fluorine' ... Conflicts: - tests/unit/states/test_virt.py - tests/unit/test_config.py	2018-10-29 12:36:28 -04:00
twangboy	fd369dd115	Mock is_windows = False	2018-10-29 10:25:56 -06:00
Nicole Thomas	f7c2f04574	Merge pull request #50182 from terminalmage/issue50050 ... Backport runtests.py modifications from develop to 2018.3	2018-10-29 12:25:06 -04:00
rallytime	f05abb09de	Merge branch '2017.7' into '2018.3'	2018-10-29 11:22:36 -04:00
Nicole Thomas	4fdcf7c4a7	Lint: Add extra blank line	2018-10-29 11:17:12 -04:00
Brett Benassi	cebfd8ad03	Fixing lint error	2018-10-29 09:08:48 -06:00
rallytime	113d76e045	Revert "Move jinja templating tests alongside salt/utils/jinja.py's tests" ... This reverts commit 6d9c2eb6b0.	2018-10-29 11:05:33 -04:00
Brett Benassi	2df611565a	Adding subnetID so it knows the right VPC to build the node in.	2018-10-29 08:57:22 -06:00
rallytime	8968f9d164	Revert "Rename test_map_conf test file to respect naming convention" ... This reverts commit 8326a09921.	2018-10-29 10:46:29 -04:00
rallytime	85a9395c2a	Remove saltclass pillar unit test for list expansion ... This test only applies to functionality present in Fluorine or newer. This commit will need to be reverted again in the fluorine branch.	2018-10-29 10:34:24 -04:00
rallytime	3d95673be0	Use get_config_dir() instead of self.config_dir ... This attribute does not exist in the 2018.3 branch. Use the function for now, and then change this back on the merge-forward.	2018-10-29 10:23:00 -04:00
rallytime	e8b3a62b31	Add init file back in for unit/client pkg ... This file was accidentally removed during some test renaming. The absence of this file prevents the test from running due to an ImportError.	2018-10-29 10:19:52 -04:00
rallytime	a0cfbdcb79	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-10-29 09:55:06 -04:00
Mike Place	25a8dbe3e9	Merge pull request #50237 from twangboy/fix_test_cmdmod ... Fix `unit.modules.test_cmdmod` on Windows in Kitchen	2018-10-29 13:56:47 +01:00