salt/tests/unit/modules
Erik Johnson 646b9ea4e5 Don't abort pillar.get with merge=True if default is None (#39116)
* Don't abort pillar.get with merge=True if default is None

This prevents a SaltInvocationError from being raised if the default is
loaded from a import_yaml jinja macro and the file being loaded is empty
(which is an entirely valid use case). In these cases, the loaded
default would be None, which we don't want to cause an exception.

* Add test case for issue 39062
2017-02-01 15:07:31 -07:00
..
inspectlib/tree_test Add unit test for file tree 2016-06-14 00:25:08 +02:00
zypp Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:13:58 +02:00
__init__.py Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
aliases_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
alternatives_test.py alternatives.install state: detect alternatives command failed 2016-09-29 18:09:16 +03:00
apache_test.py Py3 compatibility 2015-01-30 22:27:06 +00:00
archive_test.py Lint 2015-09-28 11:48:51 -06:00
artifactory_test.py Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
at_test.py Update at unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
augeas_cfg_test.py Lint test case 2015-12-04 12:43:14 -07:00
blockdev_test.py Skip test_resize2fs if resize2fs does not exists (#36325) 2016-09-15 10:14:50 -06:00
bluez_test.py Use lists, not dicts, for MagicMock side_effect 2015-03-30 13:46:48 -06:00
boto_cloudtrail_test.py Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-06 12:41:56 +01:00
boto_elb_test.py Fix boto test failures 2016-02-09 11:50:26 -07:00
boto_iot_test.py Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-06 12:41:56 +01:00
boto_lambda_test.py Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-06 12:41:56 +01:00
boto_s3_bucket_test.py Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-06 12:41:56 +01:00
boto_secgroup_test.py Merge branch '2015.8' into '2016.3' 2016-09-13 08:21:48 -06:00
boto_vpc_test.py Handle changing "is_default" value in moto package for boto test mock (#38973) 2017-01-26 12:05:30 -07:00
bower_test.py Implement Bower execution module 2015-02-21 05:56:20 +00:00
bridge_test.py Py3 compatibility 2015-01-30 22:27:08 +00:00
btrfs_test.py modules.btrfs unit tests: mock /proc/mounts 2016-03-10 10:57:20 -07:00
cassandra_test.py Py3 compatibility 2015-01-30 22:27:10 +00:00
chef_test.py Py3 compatibility 2015-01-30 22:27:11 +00:00
cmdmod_test.py Py3 compatibility fixes. 2015-01-30 22:25:31 +00:00
composer_test.py composer.install module does not support always_check, only the state does. Removing the test on the module. 2015-03-11 12:19:48 -07:00
config_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
cp_test.py Hash fileclients by opts (#33142) 2016-05-10 15:04:52 -06:00
cpan_test.py Py3 compatibility 2015-01-30 22:27:11 +00:00
cron_test.py add test 2016-12-29 17:08:24 -06:00
cyg_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
daemontools_test.py Py3 compatibility 2015-01-30 22:27:07 +00:00
data_test.py Revert "Deprecated code removed. " 2016-02-10 11:40:48 -07:00
ddns_test.py Py3 compatibility 2015-01-30 22:27:11 +00:00
deb_apache_test.py Add module and state wrappers on a2enconf/a2disconf 2015-11-05 19:07:14 +01:00
deb_postgres_test.py fix tests 2015-03-06 17:13:31 +01:00
debconfmod_test.py Py3 compatibility 2015-01-30 22:27:11 +00:00
debian_ip_test.py update debian_ip unit tests 2015-05-14 13:45:06 -06:00
debian_service_test.py Py3 compatibility 2015-01-30 22:27:11 +00:00
defaults_test.py Remove useless mocked unit test 2015-09-29 18:23:46 -06:00
devmap_test.py Py3 compatibility 2015-01-30 22:27:08 +00:00
dig_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
disk_test.py Add resize2fs unit test from blockdev_test to disk_test (#36346) 2016-09-15 14:37:53 -06:00
djangomod_test.py Py3 compatibility 2015-01-30 22:27:12 +00:00
dnsmasq_test.py Fix failing test now that we're raising a CommandExecutionError 2016-11-01 15:51:09 -06:00
dnsutil_test.py Clean up open filehandles (#35359) 2016-08-11 10:45:24 -06:00
dockerio_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
dockerng_test.py Docker 1.12 reports tags as null (#35447) 2016-08-15 10:58:50 -06:00
dpkg_test.py Py3 compatibility 2015-01-30 22:27:13 +00:00
drac_test.py Changed 17 to 16; manually tested and verified this is correct. 2015-03-17 13:34:43 -05:00
drbd_test.py Py3 compatibility 2015-01-30 22:27:16 +00:00
environ_test.py Fixed lint issues 2015-09-01 13:56:43 +02:00
etcd_mod_test.py More pylint fixes 2016-03-15 15:50:05 -06:00
event_test.py Fix missing key in opts for event tests 2016-01-21 11:06:03 -07:00
extfs_test.py Py3 compatibility 2015-01-30 22:27:05 +00:00
file_test.py fix unit.modules.file_test 2017-01-09 15:01:52 -07:00
firewalld_test.py Remove duplicate test 2015-04-04 22:31:15 -07:00
gem_test.py Update gem unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
genesis_test.py modules.genesis: update unit tests for bootstrap 2015-12-07 15:19:22 -07:00
git_test.py Add git.list_worktrees unit test 2016-01-21 15:42:30 -06:00
glusterfs_test.py Update glusterfs_test to be inline with #32312 2016-04-07 14:38:21 -06:00
gnomedesktop_test.py Py3 compatibility 2015-01-30 22:27:10 +00:00
grains_test.py Fix typo an dictionnary -> dictionary 2015-11-04 11:06:09 +01:00
groupadd_test.py Fixup new groupadd tests for syntax change in 2016.3 2016-06-08 12:42:52 -06:00
grub_legacy_test.py Py3 compatibility 2015-01-30 22:27:13 +00:00
guestfs_test.py Py3 compatibility 2015-01-30 22:27:16 +00:00
hadoop_test.py Py3 compatibility 2015-01-30 22:27:13 +00:00
haproxyconn_test.py fix mocking 2015-03-19 16:56:12 +01:00
hashutil_test.py Manual merge of #24414 per thatch45 2015-06-06 07:47:52 -06:00
hg_test.py Update test mocks for cmd.run_all dicts 2016-09-27 20:55:39 -06:00
hipchat_test.py Py3 compatibility 2015-01-30 22:27:16 +00:00
hosts_test.py salt.modules.hosts.set_host: remove entry if alias is empty 2015-08-26 20:21:45 -04:00
htpasswd_test.py Make enhancements to htpasswd modules 2015-03-13 21:18:50 +00:00
http_test.py Py3 compatibility 2015-01-30 22:27:13 +00:00
ilo_test.py Py3 compatibility 2015-01-30 23:35:22 +00:00
incron_test.py update cron and cmd tests for cron runas changes 2015-03-10 15:57:24 -06:00
influx_test.py add tests, rename a function to more closely mirror influxdb 2015-12-17 21:58:51 +01:00
ini_manage_test.py ini modules test fix 2015-08-21 16:29:30 +05:30
inspect_collector_test.py Lintfix 2016-06-14 09:39:04 +02:00
introspect_test.py Python 3 compat for several new test files 2015-02-03 11:34:49 -07:00
ipset_test.py fixing ipset unit tests based on changes. Adding additional tests for when ip set type is hash:net 2015-08-27 08:28:23 -07:00
iptables_test.py Fix iptables target options with no arguments 2016-08-16 16:00:00 +08:00
jboss7_cli_test.py Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
jboss7_test.py Skip tests that don't work with older mock 2015-08-21 21:35:11 -05:00
key_test.py Fix failed unit test 2016-02-29 21:15:43 -07:00
keyboard_test.py Merge pull request #20349 from rallytime/develop_pylint 2015-02-04 11:58:39 +00:00
keystone_test.py Add mock exception class to keystone unit test 2015-03-31 05:56:55 -06:00
kmod_test.py update kmod exec and state module unit tests 2015-11-07 16:04:23 -07:00
launchctl_test.py launchctl: update test function accordingly 2016-01-20 08:55:56 +07:00
ldapmod_test.py Python 3 compat and additions to ldapmod_test 2015-02-03 11:28:03 -07:00
linux_acl_test.py Adjust linux_acl unit test argument ordering 2016-11-23 17:02:23 +00:00
linux_lvm_test.py Add realpath to lvm.pvdisplay and use it in vg_present 2016-02-04 17:21:38 -08:00
linux_sysctl_test.py Fix tests that assert CommandExecutionError (#32485) 2016-09-08 12:39:28 +01:00
localemod_test.py Fix localemod tests (#35583) 2016-08-18 20:56:20 -06:00
locate_test.py Python 3 compat for several new test files 2015-02-03 11:34:49 -07:00
logadm_test.py Py3 compatibility 2015-01-30 23:37:36 +00:00
logrotate_test.py Python 3 compat for several new test files 2015-02-03 11:34:49 -07:00
lvs_test.py Merge #20374 with some fixes 2015-02-04 08:52:33 -07:00
mac_assistive_test.py Update mac_assistive module for El Capitan (10.11) (#33047) 2016-05-04 15:34:03 -06:00
mac_brew_test.py modules.mac_brew: update unit tests 2016-05-25 22:15:12 -06:00
mac_defaults_test.py Added the ability to set OS X settings using defaults 2016-02-01 15:24:02 +01:00
mac_desktop_test.py Add mac_desktop integration tests 2016-03-24 17:02:53 -06:00
mac_group_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
mac_keychain_test.py Lint fixes 2016-01-29 12:34:35 +01:00
mac_pkgutil_test.py Remove unit tests without logic 2016-03-21 17:47:34 -06:00
mac_power_test.py Fix unit tests 2016-03-21 12:15:08 -06:00
mac_sysctl_test.py Fix tests that assert CommandExecutionError (#32485) 2016-09-08 12:39:28 +01:00
mac_user_test.py Update mac_user unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
mac_xattr_test.py Update tests to include fix for renamed function 2016-09-28 11:00:33 -05:00
mdadm_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
memcached_test.py More Python 3 compat changes to new test modules 2015-02-03 11:40:27 -07:00
mine_test.py Fix for mine to merge configuration on update. 2016-02-02 10:43:00 -08:00
mod_random_test.py Fix mod_random test on older distros 2015-02-10 08:46:42 -07:00
modjk_test.py Properly indent comments 2015-04-21 20:35:14 -06:00
monit_test.py modules/monit: alias reload function also and fix lint issues 2015-12-01 21:42:56 +01:00
moosefs_test.py More Python 3 compat changes to new test modules 2015-02-03 11:40:27 -07:00
mount_test.py Some unit tests fixes (#36227) 2016-09-12 11:43:12 -06:00
munin_test.py Python 3 compat for several new test files 2015-02-03 11:34:49 -07:00
mysql_test.py Fixed use of assert_has_calls in tests. 2016-09-08 11:36:17 +01:00
nagios_test.py implemented unit test cases for nagios module 2015-02-09 19:49:14 +05:30
netscaler_test.py resolved errors. 2015-04-17 12:34:26 +05:30
network_test.py fix unit test (attempt 1) 2015-12-02 08:34:59 -07:00
neutron_test.py Fix typos of retrieve 2016-04-04 14:27:41 +02:00
nfs3_test.py Python 3 compatibility changes for develop 2015-04-02 14:04:28 -06:00
nftables_test.py removed pylint errors 2015-03-27 18:21:56 +05:30
nginx_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
nova_test.py Python 3 compat fixes for develop 2015-04-17 12:00:01 -06:00
npm_test.py adding npm unit test case 2015-02-17 18:14:15 +05:30
openstack_config_test.py adding openstack_config unit test case 2015-02-17 18:17:10 +05:30
oracle_test.py Python 3 compat fixes for develop 2015-04-17 12:00:01 -06:00
pagerduty_test.py Mock config.option for pagerduty tests 2015-04-16 12:36:40 -06:00
pam_test.py adding pam unit test 2015-03-25 13:46:11 +05:30
parallels_test.py modules.parallels: add unit tests 2016-04-02 16:42:00 -06:00
parted_test.py modules.parted: __virtual__ return err msg. 2015-12-29 16:55:48 -03:00
pecl_test.py adding pecl unit test case. 2015-04-14 17:58:15 +05:30
pillar_test.py Don't abort pillar.get with merge=True if default is None (#39116) 2017-02-01 15:07:31 -07:00
pip_test.py update pip state and integration tests for newer pip versions (#32905) 2016-04-29 10:49:29 -07:00
pkg_resource_test.py Fix another unit test stacktrace in pkg_resource 2016-06-07 15:55:52 -06:00
pkgutil_test.py pkgutil unit test case 2015-03-09 13:16:45 +05:30
portage_config.py Fix PortageConfigTestCase in case of portage is not present 2016-09-08 12:39:28 +01:00
postfix_test.py adding postfix unit test case 2015-04-21 17:36:07 +05:30
postgres_test.py Fix one remaining postgresql tests linked to #36787. 2016-10-05 17:05:10 +02:00
poudriere_test.py adding poudriere unit test 2015-03-11 10:24:19 +05:30
powerpath_test.py adding powerpath unit test case 2015-04-22 17:38:44 +05:30
proxy_test.py Make sure we enable the proxy settings on windows 2016-03-15 12:02:12 +01:00
ps_test.py modules.ps unit tests: check ps __virtual__ 2016-03-10 10:57:20 -07:00
publish_test.py adding publish unit test 2015-03-27 10:52:25 +05:30
puppet_test.py Fix tests that assert CommandExecutionError (#32485) 2016-09-08 12:39:28 +01:00
pw_group_test.py modules.pw_group: mock (BSD) test to run on MacOS 2016-03-10 10:57:20 -07:00
pw_user_test.py Support unicode in all GECOS fields on FreeBSD (#32794) 2016-04-25 15:19:13 -06:00
pyenv_test.py adding pyenv unit test 2015-03-17 15:07:41 +05:30
qemu_img_test.py adding qemu_img unit test case 2015-04-23 18:13:27 +05:30
qemu_nbd_test.py adding qemu_nbd unit test 2015-03-12 10:55:36 +05:30
rabbitmq_test.py Resolved merge conflict with upstream. 2015-11-11 16:38:31 +00:00
raet_publish_test.py Update raet_publish unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
random_org_test.py modules.random_org unit tests: skip if random.org down 2016-06-08 20:46:20 -06:00
rbenv_test.py remove rbenv test that doesn't really test anything 2015-10-13 10:52:58 -05:00
rdp_test.py Add some python 3 compatibility fixes for new test files 2015-02-13 11:30:45 -07:00
redismod_test.py adding redismod unit test case. 2015-06-29 14:13:45 +05:30
ret_test.py adding ret unit test case 2015-02-17 18:19:04 +05:30
rh_ip_test.py PyLint problems fix 2015-07-08 16:40:57 +02:00
rh_service_test.py rh_service._chkconfig_is_enabled unit tests 2015-11-13 23:38:40 -07:00
riak_test.py Lint riak 2015-06-17 13:03:35 -06:00
rpm_test.py lint issue fixed 2016-05-26 08:26:24 +01:00
rsync_test.py Rsync synchronized updates. 2016-08-19 10:42:37 -06:00
runit_test.py adding runit unit test 2015-03-25 11:14:18 +05:30
rvm_test.py Update rvm unit tests to reflect changes in execution module 2015-10-13 10:52:59 -05:00
s3_test.py Merge branch '2015.8' into '2106.3' 2016-08-24 09:58:56 -06:00
s6_test.py s6 service module 2015-10-20 11:43:09 +01:00
saltcloudmod_test.py Adding saltcloudmod.py unit test 2015-03-31 15:32:49 +05:30
schedule_test.py Fix schedule_test failure 2015-10-15 14:49:26 -06:00
scsi_test.py Fix lsscsi issues for certain platforms 2016-01-27 21:15:26 -08:00
sdb_test.py adding sdb unit test case 2015-02-17 18:20:58 +05:30
seed_test.py Updated seed_test.py for changes made to seed module 2016-01-13 11:58:05 -07:00
sensors_test.py adding sensors unit test case 2015-05-08 16:11:20 +05:30
serverdensity_device_test.py Server Density agentv2 support (#32772) (#33303) 2016-05-17 09:50:36 -07:00
service_test.py [tests/unit][modules/service] add service.run, fix service.* 2015-10-31 14:42:05 +03:00
shadow_test.py Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
slack_notify_test.py Correct broken slack tests 2015-07-14 10:35:06 -06:00
smf_test.py adding smf unit test case 2015-05-12 18:06:49 +05:30
smtp_test.py adding smtp unit test case. 2015-04-07 17:39:32 +05:30
solr_test.py adding solr unit test case 2015-05-13 17:14:53 +05:30
sqlite3_test.py adding sqlite3_test unit test 2015-03-31 15:39:26 +05:30
ssh_test.py Back-port #31139 to 2015.8 (#32868) 2016-04-26 10:44:01 -06:00
state_test.py Merge branch '2015.8' into 'develop' 2016-01-14 13:33:53 -07:00
status_test.py modules.status.uptime unit test: mock on linux 2016-10-21 15:50:42 -06:00
supervisord_test.py added requested change. 2015-03-30 17:48:29 +05:30
svn_test.py adding svn unit test case 2015-05-15 17:39:21 +05:30
swift_test.py adding swift unit test case 2015-02-17 18:09:33 +05:30
sysbench_test.py adding sysbench unit test case 2015-05-18 17:43:37 +05:30
syslog_ng_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
sysmod_test.py Remove Python 2.6 incompatible section of test 2015-04-21 12:25:31 -06:00
system_test.py make system.reboot use shutdown -r when available 2015-10-12 21:54:42 +02:00
systemd_test.py Merge pull request #36755 from terminalmage/issue36671 2016-10-13 13:41:50 -06:00
test_network.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
timezone_test.py update tests, we have a correct return now 2016-01-25 17:30:23 +00:00
tls_test.py Skip test_cert_info tls unit test on pyOpenSSL upstream errors 2016-12-12 14:21:41 -07:00
twilio_notify_test.py adding twilio_notify unit test case. 2015-04-03 14:29:49 +05:30
uptime_test.py more lint 2015-03-10 10:30:49 -06:00
useradd_test.py Fix tests (#35693) 2016-09-08 12:39:28 +01:00
uwsgi_test.py Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
varnish_test.py adding varnish unit test case 2015-05-25 16:01:02 +05:30
virt_test.py py3: fix tests/unit/modules/virt_test.py 2015-06-09 13:06:44 -06:00
virtualenv_test.py Update virtualenv unit tests to reflect changes in execution module 2015-10-13 10:52:58 -05:00
vsphere_test.py Remove unnecessary import block 2015-12-28 16:14:13 -07:00
win_autoruns_test.py adding win_autoruns unit test case 2015-02-20 19:16:09 +05:30
win_certutil_test.py Added the ability to add and remove certificates from Windows minions 2016-02-02 10:06:20 +01:00
win_disk_test.py adding win_disk unit test case. 2015-04-10 18:01:22 +05:30
win_dism_test.py fix unit tests 2016-07-26 19:46:14 +02:00
win_dns_client_test.py py3: fix tests/unit/modules/win_dns_client_test.py 2015-06-09 14:06:38 -06:00
win_firewall_test.py Added the ability to enable icmp rules on Windows Firewalls 2016-01-28 14:38:50 +01:00
win_groupadd_test.py depend on win libs rather than mocking them 2015-07-01 11:14:19 -06:00
win_ip_test.py adding win_ip unit test case. 2015-04-06 15:35:01 +05:30
win_license_test.py Lint fixes 2016-02-02 11:48:17 +01:00
win_network_test.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-08-25 13:55:44 -06:00
win_ntp_test.py adding win_ntp unit test case 2015-02-25 18:46:45 +05:30
win_path_test.py Fixed some tests... hopefully... 2015-09-15 16:27:47 -06:00
win_powercfg_test.py Fixed lint issues 2015-06-23 10:46:37 +02:00
win_servermanager_test.py Fixing more stupid unit tests 2016-06-07 15:33:12 -06:00
win_service_test.py Fix tests 2016-10-17 13:31:55 -06:00
win_shadow_test.py Fix broken tests 2015-12-21 11:25:18 -07:00
win_status_test.py Lint win_status 2015-06-18 14:29:19 -06:00
win_system_test.py Fix tests for get_hostname 2017-01-18 11:27:50 -07:00
win_timezone_test.py adding win_timezone unit test case 2015-03-03 18:46:53 +05:30
xapi_test.py Fix test for "stop" function 2015-07-15 19:03:48 +02:00
zcbuildout_test.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-04-21 10:42:22 -06:00
zfs_test.py Fixes failing test on Suse Leap (#34621) 2016-07-12 18:48:06 -04:00
znc_test.py adding znc unit test 2015-03-10 10:36:10 +05:30
zpool_test.py fix type in test data 2015-12-22 21:21:07 +00:00
zypper_test.py Including resolver params for Zypper debug-solver 2016-11-03 08:34:26 +00:00