valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
96,290 Commits 24 Branches 182 Tags 341 MiB
3d52b26cbd
Commit Graph

14377 Commits

Author SHA1 Message Date
Jeremy McMillan
e32d219599 backport test improvements from develop 
Bogus random test failures
forklifted from develop at 414bfe61a4
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
0a92c4691d Need more detail on test failure 2019-01-15 16:31:35 +00:00
Jeremy McMillan
c92a24752c don't try to handle/log test exception 2019-01-15 16:31:35 +00:00
Jeremy McMillan
eb605867c6 remove bad extra test assertion inside exception handler 2019-01-15 16:31:35 +00:00
Jeremy McMillan
f9594b8a1f don't test invalid combination 2019-01-15 16:31:35 +00:00
Jeremy McMillan
de823fd3ae fix good_host_ports iteration 2019-01-15 16:31:35 +00:00
Jeremy McMillan
c5a5b34fc4 test assertion correction 2019-01-15 16:31:35 +00:00
Jeremy McMillan
d28bab6fd0 fix test setup 2019-01-15 16:31:35 +00:00
Jeremy McMillan
571603c4ce coverage for master host:port ipv4 and ipv6 config value support 
fix test_parse_host_port bad values
lint
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
f14ff16626 fix minion zmq connecting to master configured as IPv6 address 2019-01-15 16:31:35 +00:00
Jeremy McMillan
194a024ed0 coverage for master host:port ipv4 and ipv6 config value support 
fix test_parse_host_port bad values
lint
 2019-01-15 16:31:35 +00:00
Jeremy McMillan
df7338809b fix minion zmq connecting to master configured as IPv6 address 2019-01-15 16:31:35 +00:00
Erik Johnson
a3c0b49b64
Fix poorly-written test 
This test was confirming the incorrect prior behavior.
 2019-01-15 05:56:40 -06:00
Shane Lee
05836b3948
Merge branch '2018.3' into issue51158 2019-01-14 20:06:02 -07:00
Daniel A. Wozniak
11cc7b33d4
Remove un-needed test 2019-01-14 20:00:09 -07:00
Daniel A. Wozniak
0f87812aff
Merge develop, Revert exception handling 2019-01-14 19:50:16 -07:00
Daniel A. Wozniak
7365a1a8ec
Pass bytes to idna 2019-01-14 19:10:23 -07:00
Daniel A. Wozniak
bf47f6f806
Fix linter 2019-01-14 16:02:03 -07:00
Gareth J. Greenaway
d39d8b720d
Merge branch '2018.3' into merge-2018.3 2019-01-14 14:48:44 -08:00
Daniel A. Wozniak
6223596073
Honor roster file for ssh orchestrations 2019-01-14 14:21:03 -07:00
Ch3LL
74edfd97f3
Fix pylint 2019-01-14 15:09:27 -05:00
Adam Mendlik
1a4e307c0d
Ignore exceptions when generating the minion ID 
Fixes #51160
 2019-01-13 20:44:11 -07:00
Daniel Wozniak
fad8621ecb
Merge pull request #51154 from twangboy/auditpol 
Add support for Advanced Audit policies
 2019-01-12 14:43:26 -07:00
Gareth J. Greenaway
f7caa4df51
Fixing lint 2019-01-11 17:01:33 -08:00
Gareth J. Greenaway
e8c8c0f451
Adding some tests to ensure "ALL PRIVILEGES" is handled correctly in 8.0 and 5.6 2019-01-11 16:48:58 -08:00
twangboy
906437647f
Add support for Advanced Audit policies 2019-01-11 17:47:52 -07:00
Ch3LL
81a3d4724a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/unit/modules/test_debian_ip.py
 2019-01-11 16:38:51 -05:00
Gareth J. Greenaway
3395a3d185
Merge branch '2017.7' into bugfix-2017.7/ubuntu-networking-searchdomain 2019-01-07 11:52:27 -08:00
Gareth J. Greenaway
9386aab9da
Merge branch '2017.7' into merge-2018.3 2019-01-07 09:42:55 -08:00
Gareth J. Greenaway
cd336ed822
Merge branch '2018.3' into ldap-groups 2019-01-02 18:49:00 -08:00
Erik Johnson
6dbd81fb4b
Add unit test to ensure we don't diff bare repos 
Resolves #38502.
 2019-01-02 15:43:16 -06:00
Adam Mendlik
94f8ee4a7b
Update unit tests for auth.ldap 2018-12-31 14:34:10 -07:00
Daniel Wozniak
cecd108aff
Merge pull request #51004 from twangboy/win_wusa 
Add tests for the win_wusa state and module
 2018-12-31 13:03:29 -07:00
twangboy
c0d2495713
Fix lint, add test docs 2018-12-28 12:18:48 -07:00
twangboy
17502700fc
Add state tests for win_wusa 2018-12-28 11:57:23 -07:00
twangboy
6285b64e0e
Update win_wusa and add tests 2018-12-27 17:29:47 -07:00
Gareth J. Greenaway
6170fa597c
Merge branch '2018.3' into merge-2017.7 2018-12-26 11:30:54 -08:00
Benjamin Drung
df8d7b9d05 Fix twilio version checking 
twilio.__version__ is a string and twilio.__version_info__ is a tuple of
strings containing integers [e.g. ('6', '8', '2')]. The
test_twilio_notify unittest fails:

```
ERROR: unit.modules.test_twilio_notify (unittest.loader._FailedTest)
----------------------------------------------------------------------
ImportError: Failed to import test module: unit.modules.test_twilio_notify
Traceback (most recent call last):
  File "/usr/lib/python3.7/unittest/loader.py", line 434, in _find_test_path
    module = self._get_module_from_name(name)
  File "/usr/lib/python3.7/unittest/loader.py", line 375, in _get_module_from_name
    __import__(name)
  File "tests/unit/modules/test_twilio_notify.py", line 20, in <module>
    import salt.modules.twilio_notify as twilio_notify
  File "salt/modules/twilio_notify.py", line 28, in <module>
    if twilio.__version__ > 5:
TypeError: '>' not supported between instances of 'str' and 'int'
```

Fix the twilio version check to use __version_info__ and converting its
elements to int.
 2018-12-21 11:21:58 +01:00
Gareth J. Greenaway
cdc7825f56
yet another lint fix. 2018-12-20 17:26:47 -08:00
Gareth J. Greenaway
f44a87ee66
One last lint fix. 2018-12-20 16:40:32 -08:00
Gareth J. Greenaway
45f363b152
Fixing various lint errors. 2018-12-20 16:19:01 -08:00
Gareth J. Greenaway
6a65bf94bc
Merge branch '2017.7' into merge-2017.7 
Conflicts:
	salt/utils/minions.py
 2018-12-20 11:18:38 -08:00
twangboy
01f9beb5a9
Fix failing lgpo netsh tests 2018-12-19 22:35:17 -07:00
Daniel A. Wozniak
16d10fbad7
Fix linter warnings 2018-12-19 10:03:18 -07:00
Daniel A. Wozniak
b22f827e79
Increase and standardize ShellCase timeouts 2018-12-19 10:02:57 -07:00
Gareth J. Greenaway
bcf8f06aa4
fixing lint 2018-12-18 16:48:14 -08:00
Gareth J. Greenaway
543ec7bc79
Ensure source_hash returned from get_source_sum is lowercase. 2018-12-18 16:51:26 -07:00
Jason Young
69d25aa696 update debian_ip test 2018-12-17 09:21:20 -08:00
Gareth J. Greenaway
af3e1459c3
Cleanup. 2018-12-14 09:28:44 -08:00
Gareth J. Greenaway
b85c5bf6d9
Adding a test to ensure exception handling is correct. 2018-12-14 09:16:09 -08:00
Ch3LL
89b4e096db
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/topics/development/dunder_dictionaries.rst
  - salt/grains/core.py
  - salt/netapi/rest_tornado/saltnado.py
 2018-12-14 11:15:48 -05:00
Daniel Wozniak
6ea059d308
Merge pull request #50843 from bdrung/fix-tests 
Fix RemoveCapacityFromDiskgroupTestCase require pyvmomi
 2018-12-12 13:36:31 -07:00
Benjamin Drung
0d00ae4f8e Fix RemoveCapacityFromDiskgroupTestCase require pyvmomi 
If the `pyvmomi` library is missing, all tests from the
tests.unit.modules.RemoveCapacityFromDiskgroupTestCase will fail:

```
ERROR: test__get_proxy_target_call
(unit.modules.test_vsphere.RemoveCapacityFromDiskgroupTestCase)
[CPU:0.0%|MEM:35.1%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "salt/utils/vmware.py", line 485, in disconnect
    Disconnect(service_instance)
NameError: name 'Disconnect' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "salt/modules/vsphere.py", line 381, in _gets_service_instance_via_proxy
    salt.utils.vmware.disconnect(local_service_instance)
  File "salt/utils/vmware.py", line 486, in disconnect
    except vim.fault.NoPermission as exc:
NameError: name 'vim' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "salt/utils/vmware.py", line 485, in disconnect
    Disconnect(service_instance)
NameError: name 'Disconnect' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "tests/unit/modules/test_vsphere.py", line 1568, in test__get_proxy_target_call
    capacity_disk_ids=['fake_disk1', 'fake_disk2'])
  File "salt/modules/vsphere.py", line 295, in __supports_proxies
    return fn(*args, **salt.utils.args.clean_kwargs(**kwargs))
  File "salt/modules/vsphere.py", line 386, in _gets_service_instance_via_proxy
    salt.utils.vmware.disconnect(local_service_instance)
  File "/home/bdrung/projects/salt/debian/salt/utils/vmware.py", line 486, in disconnect
    except vim.fault.NoPermission as exc:
NameError: name 'vim' is not defined
```

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
 2018-12-12 20:21:49 +01:00
Erik Johnson
1a00abc5f6
Add unit test for _get_proc_cmdline 2018-12-12 11:41:18 -06:00
Erik Johnson
9eaa2edfe3
Remove extraneous comments 2018-12-12 11:11:12 -06:00
Jenkins
f077783cbd
Add some tests 2018-12-10 13:43:54 -07:00
Mike Place
b1e5f3f887
Merge pull request #50709 from mattLLVW/service_unmask 
service.running unmask option
 2018-12-10 12:13:31 -07:00
Mike Place
9f8289be9c
Merge pull request #50692 from terminalmage/update-tests 
Update a couple test modules to use with_tempdir/with_tempfile decorators
 2018-12-10 10:24:02 -07:00
Mike Place
3a71567f43
Merge pull request #50768 from sathieu/git_pillar_all_saltenvs 
git_pillar: Add support for all_saltenvs parameter
 2018-12-10 09:39:36 -07:00
Mike Place
12a8447741
Merge pull request #50796 from dwoz/issue48801 
Fix #48801 min, max, inact, and warn changes
 2018-12-10 09:30:13 -07:00
Michael Lustfield
d34eadec0c
Use a temp file instead of /etc/network/interfaces for unit tests. 2018-12-10 10:45:42 -05:00
Michael Lustfield
1b096fbee6
Removed python lint. 2018-12-10 10:45:01 -05:00
Michael Lustfield
638f899e6d
Added support for loopback devices to modules.debian_ip(). (Fixes: #38672) 2018-12-10 10:44:15 -05:00
Michael Lustfield
cf61c8d9cf
Added a bunch of unit tests for modules.debian_ip.build_interface(). 2018-12-10 10:44:06 -05:00
Daniel A. Wozniak
6b9522343e
fix linter errors 2018-12-07 18:41:42 -07:00
Daniel A. Wozniak
87a04df512
Fix #48801 min, max, inact, and warn changes 
The _changes method was not properlt reporting mindays, maxdays,
inactdays and warndays values
 2018-12-07 17:22:11 -07:00
Mike Place
b19925553d
Merge branch '2017.7' into service_unmask 2018-12-06 11:24:34 -07:00
Mike Place
dc9414cd0e
Merge pull request #50767 from dwoz/ldap_no_pass 
Make sure ldap passwords are honored
 2018-12-05 15:59:16 -07:00
Daniel A. Wozniak
67aa591d1e
Fix linter errors 2018-12-05 13:12:34 -07:00
Mathieu Parent
e9714126ac
git_pillar: Add support for all_saltenvs parameter 
On the road to #32245.
 2018-12-05 20:56:29 +01:00
Daniel A. Wozniak
be3945afeb
Remove crufty import 2018-12-05 12:56:16 -07:00
Daniel A. Wozniak
91f50a4ce7
Add more ldap auth tests for ZD-2993 2018-12-05 12:55:26 -07:00
Daniel A. Wozniak
055a8d5d74
Make sure ldap passwords are honored 2018-12-05 12:46:10 -07:00
Mathieu Parent
5423c27f84
git_pillar: Allow root and mountpoint parameters together 
Fixes: #50364
 2018-12-05 05:20:04 +01:00
Brandon Ewing
9931a41955
Fix last key detection in pepa key_value_to_tree 
pepa.key_value_to_tree only checks the name of the key when attempting
to identify the last key in a flattened key.  This can lead to strange
behavior when the final key name also occurs earlier in the flatkey.

This change explicitly checks that we are the final key in flatkey
prior to setting value.  Test included.

Also see mickep76/pepa#11 and mickep76/pepa#12
 2018-12-04 20:35:34 -06:00
Gareth J. Greenaway
fde8db5ef4
Merge branch '2017.7' into merge-2017.7 
Conflicts:
	tests/support/case.py
 2018-12-04 15:53:04 +01:00
Mike Place
36a4a1af49
Merge branch '2018.3' into update-tests 2018-12-03 13:04:16 -07:00
Erik Johnson
be14517c5c
Make x509 tests use tempfiles instead of hard-coding them 
This keeps us from needing to manually clean them up in the tearDown
 2018-12-03 13:13:14 -06:00
Daniel Wozniak
246c055676
Merge pull request #50718 from dwoz/run_run_timeout 
Honor run_run timeout for shell tests
 2018-12-03 09:00:23 -07:00
Daniel A. Wozniak
ecd84863cd
Honor run_run timeout for shell tests 2018-12-02 15:21:17 -07:00
matt LLVW
823c4ad0e3 Implement unmask in states.services 
Fixes #46014
 2018-11-30 21:55:11 +01:00
Mike Place
edaa9fed03
Merge pull request #50685 from Ch3LL/merge_2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-11-30 11:46:06 -07:00
Ch3LL
d46aff05fc
Merge branch 2017.7 into 2018.3 
Conflicts:
  - salt/modules/file.py
 2018-11-29 13:09:15 -05:00
Mike Place
a5c7639ecb
Merge pull request #50657 from terminalmage/issue49392 
Rewrite host.present state to allow for removal of entries not matching IP
 2018-11-29 10:58:39 -07:00
Erik Johnson
a394cd76f6
Update file integration tests to use decorator for tempdirs 2018-11-29 09:29:23 -06:00
Gareth J. Greenaway
6b73c7637f
When using file.replace, with the search_only option, if the pattern does not exist in the file then we should return False. 2018-11-28 09:47:24 -08:00
Erik Johnson
e4946f9cec
Rename "remove" argument to "clean" 2018-11-28 11:41:48 -06:00
Gareth J. Greenaway
0ec8bcfd2f
When using the gem installed state, when passing a version that includes greater than or less than symbols, ensure that the installed versions meets that requirement. 2018-11-27 14:02:24 -08:00
Erik Johnson
7fd3bcea47
Add remove parameter to host.present state 2018-11-27 15:13:29 -06:00
Erik Johnson
2671a30671
Add unit tests for host.present state 2018-11-27 15:13:29 -06:00
twangboy
c4cb729257
Fix path issues with the tests 2018-11-27 12:49:27 -07:00
Gareth J. Greenaway
fced78bfa7
lint 2018-11-26 11:47:56 -08:00
Gareth J. Greenaway
45a1aa3bdc
Merge branch '2017.7' into merge-2017 
Conflicts:
	tests/unit/transport/test_zeromq.py
 2018-11-26 11:37:07 -08:00
Mike Place
5b7ab35dca
Merge pull request #50130 from garethgreenaway/49957_master_schedule_ignoring_maxrunning 
[2018.3] Fixes to schedule maxrunning on master
 2018-11-26 13:35:34 -05:00
Gareth J. Greenaway
96742aed42
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host 2018-11-23 17:14:17 -08:00
Gareth J. Greenaway
2f6dac917b
Updating test_maxrunning_master to Mock get_running_jobs. 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
4bd0406e8d
Adding integration.scheduler.test_maxrunning to ignore list. 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
45e160d8fe
Adding integration.scheduler.test_maxrunning to filename_map.yml 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
44940d6c23
Ensure minion tests using minion options. 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
722be433c2
Fixing lint 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
65b44214d4
Adding some master specific functions to uitls/masters.py to determine if a Salt process is running. Updating utils/schedule.py to use the appropriate running function either from utils/master.py or utils/minion.py depending on where the scheduled job is running. Adding tests to test maxrunning in scheduled jobs for both the minion and master. 2018-11-23 17:07:16 -08:00
Daniel A. Wozniak
a289e3cd55
Merge branch '2017.7' into zmqpubserv 2018-11-22 17:33:02 -07:00
Gareth J. Greenaway
9f422b2a06
Moving the minion_blackout code to the start of the try...except. Adding a test to ensure we get a log.exception when minion_blackout is True. 2018-11-21 14:29:45 -08:00
Gareth J. Greenaway
eb510a6675
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host 2018-11-21 08:51:09 -08:00
Daniel Wozniak
60b4622570
Merge pull request #50366 from jdsieci/2018.3-fix-issue50254 
2018.3 fix issue50254
 2018-11-20 13:31:29 -07:00
Gareth J. Greenaway
6d2309da50
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host 2018-11-20 08:44:05 -08:00
Gareth J. Greenaway
3661ee071a
Adding test=True to artifactory.download. 2018-11-19 16:42:11 -08:00
Gareth J. Greenaway
db89b27ff2
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host 2018-11-19 15:22:57 -08:00
Gareth J. Greenaway
4c85119a57
merge-forward 2017.7 to 2018.3 2018-11-19 10:39:38 -08:00
Gareth J. Greenaway
dcae2f08c4
Merge branch '2018.3' into 50266_core_virtual_grain_fixes 2018-11-16 14:48:33 -08:00
Gareth J. Greenaway
0284323d50
Ensure that verify_login is using the host from the connection_args and not the host associated with the user. Adding a test to ensure user_exists when the passed host is the MySQL wildcard %. 2018-11-16 14:01:31 -08:00
Mathieu Parent
12ea1cc01e
git_pillar: Add tests for mountpoint parameter 
(cherry picked from commit 6e2f4e471d08fcc29ce144af6dcd605b85644522)
 2018-11-16 06:07:24 +01:00
Mathieu Parent
fce467e438
git_pillar: Add tests for root parameter 
(cherry picked from commit 2e88b74816)
 2018-11-16 06:07:24 +01:00
Mathieu Parent
ba150a5182
Don't fail on git_pillar tests when destructive tests are not enable 
This fixes the following when running `python tests/runtests.py --ext-pillar`:

 --------  Tests with Errors  ------------------------------------------------------------------------------------------------------------------------
   -> tearDownClass (integration.pillar.test_git_pillar.TestGitPythonSSH)  ...........................................................................
       Traceback (most recent call last):
         File ".../salt/tests/support/gitfs.py", line 481, in tearDownClass
           if cls.case.sshd_proc is not None:
       AttributeError: 'NoneType' object has no attribute 'sshd_proc'
   ...................................................................................................................................................
   -> tearDownClass (integration.pillar.test_git_pillar.TestPygit2SSH)  ..............................................................................
       Traceback (most recent call last):
         File ".../salt/tests/support/gitfs.py", line 481, in tearDownClass
           if cls.case.sshd_proc is not None:
       AttributeError: 'NoneType' object has no attribute 'sshd_proc'
   ...................................................................................................................................................
 -----------------------------------------------------------------------------------------------------------------------------------------------------

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
(cherry picked from commit 84e9fce9bb)
 2018-11-16 06:07:22 +01:00
Brett Benassi
009e52d4b9
Adding tag to ec2 cloud tests 2018-11-15 15:36:05 -07:00
Erik Johnson
fbee11dadc
Enable proxy/ssh daemons when filename mapping causes those tests to be run 
The proxy and ssh tests won't run when the `--proxy` and `--ssh` CLI
flags, respectively, aren't passed to runtests.py. This ensures that we
start the daemons when the file mapping logic triggers them to be run.
 2018-11-15 16:26:05 -06:00
Daniel A. Wozniak
39e811b296
Add issue url to tests 2018-11-15 12:02:58 -07:00
Gareth J. Greenaway
4f30611c69
lint 2018-11-15 10:31:30 -08:00
Gareth J. Greenaway
4f9eb95d7f
Fixing a typo in the _virtual function, should be checking for existing grains in osdata not grains. Updating the detection to look for /sys/bus/xen/drivers/xenconsole instead of specifically looking for any files under /sys/bus/xen/drivers. Some systems that are not running as Xen PV hosts include files under that location, particular Oracle Linux. 2018-11-15 10:31:30 -08:00
bornwitbugs
e59ced6507
Merge branch '2018.3' of github.com:saltstack/salt into load_beacon_fix 2018-11-14 17:54:37 +00:00
Ch3LL
178dab3a4b
Merge branch 2017.7 into 2018.3 
Conflicts:
  - doc/topics/tutorials/salt_bootstrap.rst
  - tests/integration/cloud/clouds/test_digitalocean.py
 2018-11-14 10:33:44 -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
c00fd43ee9
Merge pull request #50493 from rallytime/bp-50362 
Back-port #50362 to 2017.7
 2018-11-13 11:59:50 -05: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
twangboy
60559cfa8a
Remove flaky test 2018-11-13 09:25:47 -05:00
twangboy
a696a8f564
Fix test_matcher on Windows 
Fixes a timeout issue in test_salt_documentation_arguments_not_assumed
 2018-11-13 09:25:41 -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
917781dc95
Lint: Add blank line 2018-11-12 17:47:46 -05: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
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
Ch3LL
3583519da4
Update digital ocean location for cloud tests 2018-11-12 15:52:32 -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
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
Daniel A. Wozniak
4f81432321
Set subscribe via sockopt for better compatibility 2018-11-11 02:17:45 -07:00
Daniel A. Wozniak
6882209e3b
More reliable pub server publishing 
- Uses existing zmq context
- Store socket in thread local storage for re-use
- Add tests to verify publish reliability
 2018-11-11 00:58:47 -07:00
bornwitbugs
d07c84d7ad
reordering ret dictionary in load test to ascending order 2018-11-11 03:47:12 +00: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
2c51cf9816
Make target test job more specific to reduce test flakiness 2018-11-08 10:27:41 -05: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
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
Gareth J. Greenaway
039f3d1622
Increase limit for trimming. 2018-11-05 11:22:20 -08: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
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
Daniel A. Wozniak
18b5d43d09
Increase cli batch test timeout for increased reliablity 2018-11-02 17:15:31 -07:00
Jerzy Drozdz
1ab59e7e48 Added integration tests 2018-11-02 23:02:04 +01:00
Jerzy Drozdz
110f74f3ba Added unit tests reproducing issue 2018-11-02 23:01:43 +01: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
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
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
1aae681229
Merge branch '2018.3' into bp-50230 2018-10-30 12:26:15 -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
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
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
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