From ba94b4b87879dcabd6de986018fe74dfcf2e18d5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 17 Jul 2019 15:46:05 +0100 Subject: [PATCH] By these days, we should blowup if mock is not available --- .../unit/modules/test_{{module_name}}.py | 9 +- .../tests/unit/states/test_{{module_name}}.py | 10 +-- tests/integration/pillar/test_git_pillar.py | 7 -- tests/support/mixins.py | 5 +- tests/support/mock.py | 87 ++++--------------- tests/unit/auth/test_ldap.py | 3 +- tests/unit/beacons/test_adb.py | 5 +- tests/unit/beacons/test_avahi_announce.py | 4 +- tests/unit/beacons/test_bonjour_announce.py | 4 +- tests/unit/beacons/test_btmp.py | 3 +- tests/unit/beacons/test_diskusage.py | 5 +- tests/unit/beacons/test_glxinfo.py | 5 +- tests/unit/beacons/test_haproxy.py | 5 +- tests/unit/beacons/test_journald.py | 5 +- tests/unit/beacons/test_load.py | 3 +- tests/unit/beacons/test_log.py | 5 +- tests/unit/beacons/test_memusage.py | 5 +- tests/unit/beacons/test_network_info.py | 5 +- tests/unit/beacons/test_network_settings.py | 2 - tests/unit/beacons/test_ps.py | 5 +- tests/unit/beacons/test_salt_proxy.py | 5 +- tests/unit/beacons/test_sensehat.py | 5 +- tests/unit/beacons/test_service.py | 5 +- tests/unit/beacons/test_smartos_imgadm.py | 5 +- tests/unit/beacons/test_smartos_vmadm.py | 5 +- tests/unit/beacons/test_telegram_bot_msg.py | 3 +- tests/unit/beacons/test_twilio_txt_msg.py | 3 +- tests/unit/beacons/test_wtmp.py | 3 +- tests/unit/cache/test_cache.py | 9 +- tests/unit/cache/test_localfs.py | 5 +- tests/unit/cli/test_batch.py | 5 +- tests/unit/cli/test_daemons.py | 5 +- tests/unit/client/test_ssh.py | 4 +- tests/unit/cloud/clouds/test_dimensiondata.py | 3 +- tests/unit/cloud/clouds/test_ec2.py | 3 +- tests/unit/cloud/clouds/test_gce.py | 5 +- tests/unit/cloud/clouds/test_joyent.py | 3 - tests/unit/cloud/clouds/test_linode.py | 4 +- tests/unit/cloud/clouds/test_opennebula.py | 3 +- tests/unit/cloud/clouds/test_openstack.py | 5 +- tests/unit/cloud/clouds/test_saltify.py | 5 +- tests/unit/cloud/clouds/test_vmware.py | 3 +- tests/unit/daemons/test_masterapi.py | 6 +- tests/unit/engines/test_libvirt_events.py | 5 +- tests/unit/engines/test_slack.py | 3 - tests/unit/engines/test_sqs_events.py | 3 - tests/unit/fileserver/test_gitfs.py | 4 +- tests/unit/fileserver/test_roots.py | 5 +- tests/unit/grains/test_core.py | 3 - tests/unit/grains/test_disks.py | 5 +- tests/unit/grains/test_fibre_channel.py | 5 +- tests/unit/grains/test_iscsi.py | 5 +- tests/unit/grains/test_napalm.py | 5 +- tests/unit/grains/test_nvme.py | 7 +- .../unit/modules/inspectlib/test_collector.py | 3 - tests/unit/modules/test_aliases.py | 5 +- tests/unit/modules/test_alternatives.py | 7 +- tests/unit/modules/test_ansiblegate.py | 3 - tests/unit/modules/test_apache.py | 5 +- tests/unit/modules/test_aptpkg.py | 3 +- tests/unit/modules/test_archive.py | 3 +- tests/unit/modules/test_artifactory.py | 5 +- tests/unit/modules/test_at.py | 5 +- tests/unit/modules/test_azurearm_dns.py | 7 +- tests/unit/modules/test_beacons.py | 5 +- tests/unit/modules/test_bluez_bluetooth.py | 5 +- tests/unit/modules/test_boto_apigateway.py | 3 +- tests/unit/modules/test_boto_cloudtrail.py | 3 - .../modules/test_boto_cloudwatch_event.py | 3 - .../unit/modules/test_boto_cognitoidentity.py | 3 +- .../modules/test_boto_elasticsearch_domain.py | 3 - tests/unit/modules/test_boto_elb.py | 2 - tests/unit/modules/test_boto_iot.py | 4 - tests/unit/modules/test_boto_lambda.py | 5 -- tests/unit/modules/test_boto_route53.py | 2 - tests/unit/modules/test_boto_s3_bucket.py | 3 - tests/unit/modules/test_boto_secgroup.py | 2 - tests/unit/modules/test_boto_vpc.py | 11 +-- tests/unit/modules/test_bower.py | 5 +- tests/unit/modules/test_bridge.py | 5 +- tests/unit/modules/test_btrfs.py | 5 +- tests/unit/modules/test_cassandra.py | 5 +- tests/unit/modules/test_chef.py | 5 +- tests/unit/modules/test_chroot.py | 8 +- tests/unit/modules/test_cmdmod.py | 3 - tests/unit/modules/test_composer.py | 5 +- tests/unit/modules/test_config.py | 5 +- tests/unit/modules/test_cp.py | 5 +- tests/unit/modules/test_cpan.py | 5 +- tests/unit/modules/test_cron.py | 6 +- tests/unit/modules/test_cyg.py | 3 +- tests/unit/modules/test_daemontools.py | 5 +- tests/unit/modules/test_data.py | 5 +- tests/unit/modules/test_ddns.py | 3 - tests/unit/modules/test_deb_apache.py | 5 +- tests/unit/modules/test_deb_postgres.py | 7 +- tests/unit/modules/test_debconfmod.py | 5 +- tests/unit/modules/test_debian_ip.py | 3 - tests/unit/modules/test_debian_service.py | 5 +- tests/unit/modules/test_defaults.py | 5 +- tests/unit/modules/test_devmap.py | 5 +- tests/unit/modules/test_dig.py | 3 +- tests/unit/modules/test_djangomod.py | 6 +- tests/unit/modules/test_dnsmasq.py | 5 +- tests/unit/modules/test_dnsutil.py | 34 ++++---- tests/unit/modules/test_dockermod.py | 3 - tests/unit/modules/test_dpkg_lowpkg.py | 5 +- tests/unit/modules/test_drac.py | 5 +- tests/unit/modules/test_drbd.py | 5 +- tests/unit/modules/test_elasticsearch.py | 3 - tests/unit/modules/test_environ.py | 5 +- tests/unit/modules/test_esxcluster.py | 5 +- tests/unit/modules/test_esxdatacenter.py | 5 +- tests/unit/modules/test_etcd_mod.py | 5 +- tests/unit/modules/test_event.py | 5 +- tests/unit/modules/test_extfs.py | 5 +- tests/unit/modules/test_firewalld.py | 5 +- tests/unit/modules/test_gem.py | 5 +- tests/unit/modules/test_genesis.py | 5 +- tests/unit/modules/test_gentoo_service.py | 5 +- tests/unit/modules/test_git.py | 5 +- tests/unit/modules/test_glusterfs.py | 5 +- tests/unit/modules/test_gnomedesktop.py | 5 +- tests/unit/modules/test_google_chat.py | 5 +- tests/unit/modules/test_gpg.py | 8 +- tests/unit/modules/test_grains.py | 5 +- tests/unit/modules/test_groupadd.py | 3 +- tests/unit/modules/test_grub_legacy.py | 5 +- tests/unit/modules/test_guestfs.py | 5 +- tests/unit/modules/test_hadoop.py | 5 +- tests/unit/modules/test_haproxyconn.py | 4 +- tests/unit/modules/test_hg.py | 5 +- tests/unit/modules/test_http.py | 5 +- tests/unit/modules/test_ilo.py | 5 +- tests/unit/modules/test_incron.py | 5 +- tests/unit/modules/test_influxdb08mod.py | 5 +- tests/unit/modules/test_introspect.py | 5 +- tests/unit/modules/test_iosconfig.py | 4 +- tests/unit/modules/test_ipset.py | 5 +- tests/unit/modules/test_iptables.py | 5 +- tests/unit/modules/test_jboss7.py | 5 +- .../unit/modules/test_kernelpkg_linux_apt.py | 3 +- .../unit/modules/test_kernelpkg_linux_yum.py | 3 +- tests/unit/modules/test_key.py | 5 +- tests/unit/modules/test_keyboard.py | 5 +- tests/unit/modules/test_keystone.py | 5 +- tests/unit/modules/test_kubernetesmod.py | 3 - tests/unit/modules/test_launchctl_service.py | 5 +- tests/unit/modules/test_ldapmod.py | 5 +- tests/unit/modules/test_libcloud_compute.py | 3 - tests/unit/modules/test_libcloud_dns.py | 3 - .../modules/test_libcloud_loadbalancer.py | 5 +- tests/unit/modules/test_libcloud_storage.py | 3 - tests/unit/modules/test_linux_acl.py | 5 +- tests/unit/modules/test_linux_lvm.py | 5 +- tests/unit/modules/test_linux_sysctl.py | 5 +- tests/unit/modules/test_localemod.py | 3 - tests/unit/modules/test_locate.py | 5 +- tests/unit/modules/test_logadm.py | 5 +- tests/unit/modules/test_logrotate.py | 5 +- tests/unit/modules/test_lvs.py | 5 +- tests/unit/modules/test_mac_brew_pkg.py | 5 +- tests/unit/modules/test_mac_desktop.py | 5 +- tests/unit/modules/test_mac_pkgutil.py | 5 +- tests/unit/modules/test_mac_power.py | 4 +- tests/unit/modules/test_mac_service.py | 5 +- tests/unit/modules/test_mac_sysctl.py | 5 +- tests/unit/modules/test_mac_user.py | 3 +- tests/unit/modules/test_mandrill.py | 5 +- tests/unit/modules/test_match.py | 5 +- tests/unit/modules/test_mdadm_raid.py | 5 +- tests/unit/modules/test_memcached.py | 5 +- tests/unit/modules/test_mine.py | 5 +- tests/unit/modules/test_mod_random.py | 3 - tests/unit/modules/test_modjk.py | 5 +- tests/unit/modules/test_monit.py | 5 +- tests/unit/modules/test_moosefs.py | 5 +- tests/unit/modules/test_mount.py | 5 +- tests/unit/modules/test_munin.py | 5 +- tests/unit/modules/test_mysql.py | 3 +- tests/unit/modules/test_nagios.py | 5 +- tests/unit/modules/test_napalm_bgp.py | 5 +- tests/unit/modules/test_napalm_formula.py | 5 +- tests/unit/modules/test_napalm_netacl.py | 5 +- tests/unit/modules/test_napalm_network.py | 5 +- tests/unit/modules/test_napalm_ntp.py | 5 +- tests/unit/modules/test_napalm_probes.py | 5 +- tests/unit/modules/test_napalm_route.py | 5 +- tests/unit/modules/test_napalm_snmp.py | 5 +- tests/unit/modules/test_napalm_users.py | 5 +- tests/unit/modules/test_napalm_yang_mod.py | 5 +- tests/unit/modules/test_netbox.py | 3 - tests/unit/modules/test_netscaler.py | 5 +- tests/unit/modules/test_network.py | 3 - tests/unit/modules/test_neutron.py | 5 +- tests/unit/modules/test_nexus.py | 5 +- tests/unit/modules/test_nfs3.py | 5 +- tests/unit/modules/test_nftables.py | 5 +- tests/unit/modules/test_nginx.py | 5 +- tests/unit/modules/test_nova.py | 5 +- tests/unit/modules/test_npm.py | 5 +- tests/unit/modules/test_openbsd_sysctl.py | 5 +- tests/unit/modules/test_openbsdpkg.py | 5 +- tests/unit/modules/test_openscap.py | 5 +- tests/unit/modules/test_openstack_config.py | 5 +- tests/unit/modules/test_opkg.py | 5 +- tests/unit/modules/test_oracle.py | 5 +- tests/unit/modules/test_osquery.py | 5 +- tests/unit/modules/test_pacmanpkg.py | 5 +- tests/unit/modules/test_pagerduty.py | 5 +- tests/unit/modules/test_pam.py | 3 - tests/unit/modules/test_parallels.py | 5 +- tests/unit/modules/test_parted_partition.py | 5 +- tests/unit/modules/test_pecl.py | 5 +- tests/unit/modules/test_pillar.py | 7 +- tests/unit/modules/test_pip.py | 5 +- tests/unit/modules/test_pkg_resource.py | 5 +- tests/unit/modules/test_pkgin.py | 5 +- tests/unit/modules/test_pkgng.py | 5 +- tests/unit/modules/test_pkgutil.py | 5 +- tests/unit/modules/test_portage_config.py | 5 +- tests/unit/modules/test_postfix.py | 5 +- tests/unit/modules/test_postgres.py | 5 +- tests/unit/modules/test_poudriere.py | 5 +- tests/unit/modules/test_powerpath.py | 5 +- tests/unit/modules/test_proxy.py | 5 +- tests/unit/modules/test_publish.py | 5 +- tests/unit/modules/test_puppet.py | 5 +- tests/unit/modules/test_purefb.py | 5 +- tests/unit/modules/test_pw_group.py | 3 - tests/unit/modules/test_pw_user.py | 3 - tests/unit/modules/test_pyenv.py | 5 +- tests/unit/modules/test_qemu_img.py | 5 +- tests/unit/modules/test_qemu_nbd.py | 5 +- tests/unit/modules/test_rabbitmq.py | 5 +- tests/unit/modules/test_rbenv.py | 5 +- tests/unit/modules/test_redismod.py | 5 +- tests/unit/modules/test_restartcheck.py | 5 +- tests/unit/modules/test_ret.py | 5 +- tests/unit/modules/test_rh_ip.py | 5 +- tests/unit/modules/test_rh_service.py | 5 +- tests/unit/modules/test_riak.py | 5 +- tests/unit/modules/test_rpm_lowpkg.py | 5 +- tests/unit/modules/test_rsync.py | 5 +- tests/unit/modules/test_rvm.py | 5 +- tests/unit/modules/test_s3.py | 5 +- tests/unit/modules/test_s6.py | 5 +- tests/unit/modules/test_salt_version.py | 10 +-- tests/unit/modules/test_saltcheck.py | 5 +- tests/unit/modules/test_saltcloudmod.py | 5 +- tests/unit/modules/test_schedule.py | 5 +- tests/unit/modules/test_scsi.py | 5 +- tests/unit/modules/test_sdb.py | 7 +- tests/unit/modules/test_seed.py | 5 +- tests/unit/modules/test_selinux.py | 5 +- tests/unit/modules/test_sensors.py | 5 +- .../unit/modules/test_serverdensity_device.py | 5 +- tests/unit/modules/test_service.py | 5 +- tests/unit/modules/test_servicenow.py | 5 +- tests/unit/modules/test_smartos_imgadm.py | 4 +- tests/unit/modules/test_smf_service.py | 5 +- tests/unit/modules/test_smtp.py | 5 +- tests/unit/modules/test_snapper.py | 3 - tests/unit/modules/test_solarisipspkg.py | 3 - tests/unit/modules/test_solr.py | 5 +- tests/unit/modules/test_sqlite3.py | 7 +- tests/unit/modules/test_ssh.py | 5 +- tests/unit/modules/test_state.py | 5 +- tests/unit/modules/test_supervisord.py | 5 +- tests/unit/modules/test_svn.py | 5 +- tests/unit/modules/test_swift.py | 5 +- tests/unit/modules/test_sysbench.py | 5 +- tests/unit/modules/test_syslog_ng.py | 3 +- tests/unit/modules/test_sysmod.py | 5 +- tests/unit/modules/test_system.py | 5 +- tests/unit/modules/test_systemd_service.py | 6 +- tests/unit/modules/test_telegram.py | 5 +- tests/unit/modules/test_timezone.py | 4 - tests/unit/modules/test_tls.py | 3 - tests/unit/modules/test_tuned.py | 5 +- tests/unit/modules/test_twilio_notify.py | 3 - tests/unit/modules/test_udev.py | 5 +- tests/unit/modules/test_uptime.py | 5 +- tests/unit/modules/test_useradd.py | 3 - tests/unit/modules/test_uwsgi.py | 5 +- tests/unit/modules/test_vagrant.py | 5 +- tests/unit/modules/test_varnish.py | 5 +- tests/unit/modules/test_virt.py | 5 +- tests/unit/modules/test_virtualenv_mod.py | 5 +- tests/unit/modules/test_vsphere.py | 19 ---- tests/unit/modules/test_webutil.py | 5 +- tests/unit/modules/test_win_disk.py | 7 +- tests/unit/modules/test_win_dns_client.py | 3 - tests/unit/modules/test_win_file.py | 4 +- tests/unit/modules/test_win_groupadd.py | 6 +- tests/unit/modules/test_win_iis.py | 5 +- tests/unit/modules/test_win_ip.py | 5 +- tests/unit/modules/test_win_network.py | 3 - tests/unit/modules/test_win_path.py | 5 +- tests/unit/modules/test_win_pki.py | 5 +- tests/unit/modules/test_win_powercfg.py | 5 +- tests/unit/modules/test_win_service.py | 3 - tests/unit/modules/test_win_snmp.py | 5 +- tests/unit/modules/test_win_status.py | 3 +- tests/unit/modules/test_win_system.py | 3 - tests/unit/modules/test_win_wusa.py | 3 +- tests/unit/modules/test_x509.py | 3 - tests/unit/modules/test_xapi_virt.py | 5 +- tests/unit/modules/test_yumpkg.py | 3 - tests/unit/modules/test_zabbix.py | 5 +- tests/unit/modules/test_zfs.py | 5 +- tests/unit/modules/test_znc.py | 5 +- tests/unit/modules/test_zpool.py | 3 - tests/unit/modules/test_zypperpkg.py | 5 +- tests/unit/netapi/test_rest_tornado.py | 3 +- tests/unit/pillar/test_consul_pillar.py | 3 +- tests/unit/pillar/test_csvpillar.py | 5 +- .../test_extra_minion_data_in_pillar.py | 5 +- tests/unit/pillar/test_file_tree.py | 5 +- tests/unit/pillar/test_hg_pillar.py | 2 - tests/unit/pillar/test_mysql.py | 2 - tests/unit/pillar/test_saltclass.py | 5 +- tests/unit/pillar/test_sqlcipher.py | 4 +- tests/unit/pillar/test_sqlite3.py | 4 +- tests/unit/proxy/test_esxcluster.py | 3 - tests/unit/proxy/test_esxdatacenter.py | 3 - tests/unit/proxy/test_napalm.py | 5 +- tests/unit/renderers/test_aws_kms.py | 3 - tests/unit/renderers/test_gpg.py | 5 +- tests/unit/renderers/test_nacl.py | 5 +- tests/unit/returners/test_local_cache.py | 5 +- tests/unit/returners/test_pgjsonb.py | 5 +- .../returners/test_slack_webhook_return.py | 5 +- tests/unit/returners/test_smtp_return.py | 5 +- tests/unit/returners/test_syslog_return.py | 3 +- tests/unit/returners/test_telegram_return.py | 5 +- tests/unit/roster/test_ansible.py | 3 - tests/unit/roster/test_clustershell.py | 3 - tests/unit/roster/test_sshconfig.py | 5 +- tests/unit/roster/test_terraform.py | 5 +- tests/unit/runners/test_cache.py | 5 +- tests/unit/runners/test_jobs.py | 5 +- tests/unit/runners/test_queue.py | 5 +- tests/unit/runners/test_vault.py | 5 +- tests/unit/runners/test_winrepo.py | 4 +- tests/unit/sdb/test_yaml.py | 5 +- tests/unit/states/test_alias.py | 5 +- tests/unit/states/test_alternatives.py | 5 +- tests/unit/states/test_apache.py | 5 +- tests/unit/states/test_apache_conf.py | 5 +- tests/unit/states/test_apache_module.py | 5 +- tests/unit/states/test_apache_site.py | 5 +- tests/unit/states/test_aptpkg.py | 5 +- tests/unit/states/test_archive.py | 5 +- tests/unit/states/test_artifactory.py | 5 +- tests/unit/states/test_at.py | 5 +- tests/unit/states/test_augeas.py | 5 +- tests/unit/states/test_aws_sqs.py | 5 +- tests/unit/states/test_beacon.py | 5 +- tests/unit/states/test_blockdev.py | 5 +- tests/unit/states/test_boto_apigateway.py | 5 +- tests/unit/states/test_boto_asg.py | 5 +- tests/unit/states/test_boto_cloudfront.py | 5 +- tests/unit/states/test_boto_cloudtrail.py | 3 - .../unit/states/test_boto_cloudwatch_alarm.py | 5 +- .../unit/states/test_boto_cloudwatch_event.py | 3 +- .../unit/states/test_boto_cognitoidentity.py | 3 +- tests/unit/states/test_boto_dynamodb.py | 5 +- tests/unit/states/test_boto_ec2.py | 5 +- tests/unit/states/test_boto_elasticache.py | 5 +- .../states/test_boto_elasticsearch_domain.py | 3 +- tests/unit/states/test_boto_elb.py | 5 +- tests/unit/states/test_boto_iam_role.py | 5 +- tests/unit/states/test_boto_iot.py | 4 +- tests/unit/states/test_boto_kinesis.py | 5 +- tests/unit/states/test_boto_lambda.py | 5 +- tests/unit/states/test_boto_lc.py | 5 +- tests/unit/states/test_boto_route53.py | 5 +- tests/unit/states/test_boto_s3_bucket.py | 3 +- tests/unit/states/test_boto_sns.py | 5 +- tests/unit/states/test_boto_sqs.py | 5 +- tests/unit/states/test_boto_vpc.py | 6 +- tests/unit/states/test_bower.py | 5 +- tests/unit/states/test_chef.py | 5 +- tests/unit/states/test_cloud.py | 5 +- tests/unit/states/test_cmd.py | 5 +- tests/unit/states/test_composer.py | 5 +- tests/unit/states/test_cron.py | 5 +- tests/unit/states/test_cyg.py | 3 +- tests/unit/states/test_ddns.py | 5 +- tests/unit/states/test_debconfmod.py | 5 +- tests/unit/states/test_disk.py | 5 +- tests/unit/states/test_docker_image.py | 5 +- tests/unit/states/test_docker_volume.py | 5 +- tests/unit/states/test_drac.py | 5 +- tests/unit/states/test_elasticsearch.py | 5 +- tests/unit/states/test_eselect.py | 5 +- tests/unit/states/test_esxdatacenter.py | 5 +- tests/unit/states/test_event.py | 5 +- tests/unit/states/test_file.py | 3 - tests/unit/states/test_gem.py | 5 +- tests/unit/states/test_git.py | 5 +- tests/unit/states/test_glusterfs.py | 5 +- tests/unit/states/test_gnomedesktop.py | 6 +- tests/unit/states/test_grafana.py | 5 +- tests/unit/states/test_grafana_datasource.py | 5 +- tests/unit/states/test_grains.py | 5 +- tests/unit/states/test_group.py | 5 +- tests/unit/states/test_hg.py | 5 +- tests/unit/states/test_host.py | 5 +- tests/unit/states/test_http.py | 5 +- tests/unit/states/test_incron.py | 5 +- tests/unit/states/test_influxdb08_database.py | 5 +- tests/unit/states/test_influxdb08_user.py | 5 +- tests/unit/states/test_ini_manage.py | 5 +- tests/unit/states/test_ipmi.py | 5 +- tests/unit/states/test_ipset.py | 9 +- tests/unit/states/test_iptables.py | 5 +- tests/unit/states/test_jboss7.py | 5 +- tests/unit/states/test_kernelpkg.py | 3 - tests/unit/states/test_keyboard.py | 5 +- tests/unit/states/test_keystone.py | 5 +- tests/unit/states/test_keystore.py | 9 +- tests/unit/states/test_kmod.py | 5 +- tests/unit/states/test_kubernetes.py | 3 - tests/unit/states/test_layman.py | 5 +- tests/unit/states/test_ldap.py | 4 +- tests/unit/states/test_libcloud_dns.py | 7 +- tests/unit/states/test_linux_acl.py | 3 - tests/unit/states/test_locale.py | 5 +- tests/unit/states/test_loop.py | 5 +- tests/unit/states/test_lvm.py | 5 +- tests/unit/states/test_lvs_server.py | 5 +- tests/unit/states/test_lvs_service.py | 5 +- tests/unit/states/test_lxc.py | 5 +- tests/unit/states/test_makeconf.py | 5 +- tests/unit/states/test_mdadm_raid.py | 5 +- tests/unit/states/test_memcached.py | 5 +- tests/unit/states/test_modjk.py | 6 +- tests/unit/states/test_modjk_worker.py | 5 +- tests/unit/states/test_module.py | 5 +- tests/unit/states/test_mongodb_database.py | 5 +- tests/unit/states/test_mongodb_user.py | 5 +- tests/unit/states/test_mount.py | 5 +- tests/unit/states/test_mysql_grants.py | 5 +- tests/unit/states/test_mysql_query.py | 5 +- tests/unit/states/test_mysql_user.py | 5 +- tests/unit/states/test_net_napalm_yang.py | 5 +- tests/unit/states/test_network.py | 5 +- tests/unit/states/test_nexus.py | 5 +- tests/unit/states/test_nftables.py | 5 +- tests/unit/states/test_npm.py | 5 +- tests/unit/states/test_ntp.py | 5 +- tests/unit/states/test_openstack_config.py | 5 +- tests/unit/states/test_openvswitch_port.py | 5 +- tests/unit/states/test_pagerduty.py | 5 +- tests/unit/states/test_pecl.py | 5 +- tests/unit/states/test_pip_state.py | 3 +- tests/unit/states/test_pkg.py | 5 +- tests/unit/states/test_pkgng.py | 5 +- tests/unit/states/test_portage_config.py | 5 +- tests/unit/states/test_ports.py | 5 +- tests/unit/states/test_postgres.py | 8 +- tests/unit/states/test_postgres_cluster.py | 5 +- tests/unit/states/test_postgres_database.py | 5 +- tests/unit/states/test_postgres_extension.py | 5 +- tests/unit/states/test_postgres_group.py | 5 +- tests/unit/states/test_postgres_initdb.py | 5 +- tests/unit/states/test_postgres_language.py | 5 +- tests/unit/states/test_postgres_privileges.py | 5 +- tests/unit/states/test_postgres_schema.py | 5 +- tests/unit/states/test_postgres_user.py | 5 +- tests/unit/states/test_powerpath.py | 5 +- tests/unit/states/test_process.py | 5 +- tests/unit/states/test_proxy.py | 5 +- tests/unit/states/test_pyenv.py | 5 +- tests/unit/states/test_pyrax_queues.py | 5 +- tests/unit/states/test_quota.py | 5 +- tests/unit/states/test_rabbitmq_cluster.py | 5 +- tests/unit/states/test_rabbitmq_plugin.py | 5 +- tests/unit/states/test_rabbitmq_policy.py | 5 +- tests/unit/states/test_rabbitmq_vhost.py | 5 +- tests/unit/states/test_rbenv.py | 5 +- tests/unit/states/test_rdp.py | 5 +- tests/unit/states/test_redismod.py | 5 +- tests/unit/states/test_rsync.py | 5 +- tests/unit/states/test_rvm.py | 5 +- tests/unit/states/test_saltmod.py | 6 +- tests/unit/states/test_saltutil.py | 5 +- tests/unit/states/test_schedule.py | 5 +- tests/unit/states/test_selinux.py | 5 +- .../unit/states/test_serverdensity_device.py | 5 +- tests/unit/states/test_service.py | 5 +- tests/unit/states/test_slack.py | 5 +- tests/unit/states/test_smtp.py | 5 +- tests/unit/states/test_splunk_search.py | 5 +- tests/unit/states/test_ssh_auth.py | 5 +- tests/unit/states/test_ssh_known_hosts.py | 5 +- tests/unit/states/test_status.py | 5 +- tests/unit/states/test_supervisord.py | 5 +- tests/unit/states/test_svn.py | 5 +- tests/unit/states/test_sysctl.py | 5 +- tests/unit/states/test_syslog_ng.py | 5 +- tests/unit/states/test_sysrc.py | 5 +- tests/unit/states/test_test.py | 5 +- tests/unit/states/test_timezone.py | 5 +- tests/unit/states/test_tomcat.py | 5 +- tests/unit/states/test_user.py | 5 +- tests/unit/states/test_vbox_guest.py | 5 +- tests/unit/states/test_virt.py | 5 +- tests/unit/states/test_virtualenv_mod.py | 5 +- tests/unit/states/test_webutil.py | 5 +- tests/unit/states/test_win_dns_client.py | 5 +- tests/unit/states/test_win_iis.py | 7 +- tests/unit/states/test_win_network.py | 5 +- tests/unit/states/test_win_path.py | 5 +- tests/unit/states/test_win_pki.py | 5 +- tests/unit/states/test_win_powercfg.py | 5 +- tests/unit/states/test_win_servermanager.py | 5 +- tests/unit/states/test_win_snmp.py | 5 +- tests/unit/states/test_win_system.py | 5 +- tests/unit/states/test_winrepo.py | 5 +- tests/unit/states/test_xmpp.py | 5 +- tests/unit/states/test_zabbix_action.py | 5 +- tests/unit/states/test_zabbix_template.py | 5 +- tests/unit/states/test_zabbix_valuemap.py | 5 +- tests/unit/states/test_zfs.py | 5 +- tests/unit/states/test_zk_concurrency.py | 5 +- tests/unit/states/test_zpool.py | 5 +- tests/unit/test_auth.py | 3 +- tests/unit/test_client.py | 3 +- tests/unit/test_cloud.py | 10 +-- tests/unit/test_config.py | 15 ---- tests/unit/test_crypt.py | 4 - tests/unit/test_fileclient.py | 6 +- tests/unit/test_minion.py | 6 +- tests/unit/test_mock.py | 5 +- tests/unit/test_payload.py | 2 - tests/unit/test_pillar.py | 7 +- tests/unit/test_proxy_minion.py | 4 +- tests/unit/test_state.py | 4 - tests/unit/test_template.py | 5 +- tests/unit/test_zypp_plugins.py | 5 +- tests/unit/tokens/test_localfs.py | 5 +- tests/unit/tops/test_ext_nodes.py | 5 +- tests/unit/utils/test_args.py | 6 +- tests/unit/utils/test_botomod.py | 3 +- tests/unit/utils/test_cache.py | 4 +- tests/unit/utils/test_data.py | 6 +- tests/unit/utils/test_dateutils.py | 3 - tests/unit/utils/test_decorators.py | 5 +- tests/unit/utils/test_dns.py | 3 +- tests/unit/utils/test_etcd_util.py | 3 - tests/unit/utils/test_files.py | 3 - tests/unit/utils/test_gitfs.py | 5 +- tests/unit/utils/test_http.py | 9 +- tests/unit/utils/test_jid.py | 11 +-- tests/unit/utils/test_jinja.py | 4 +- tests/unit/utils/test_json.py | 3 +- tests/unit/utils/test_locales.py | 5 +- tests/unit/utils/test_mac_utils.py | 3 - tests/unit/utils/test_network.py | 4 - tests/unit/utils/test_parsers.py | 16 ---- tests/unit/utils/test_path.py | 6 +- tests/unit/utils/test_pbm.py | 11 +-- tests/unit/utils/test_pkg.py | 5 +- tests/unit/utils/test_process.py | 9 -- tests/unit/utils/test_reactor.py | 6 +- tests/unit/utils/test_sanitizers.py | 4 +- tests/unit/utils/test_schedule.py | 4 +- tests/unit/utils/test_sdb.py | 7 +- tests/unit/utils/test_ssdp.py | 6 -- tests/unit/utils/test_systemd.py | 5 +- tests/unit/utils/test_thin.py | 3 - tests/unit/utils/test_url.py | 5 +- tests/unit/utils/test_verify.py | 3 - tests/unit/utils/test_versions.py | 3 +- tests/unit/utils/test_vmware.py | 47 ---------- tests/unit/utils/test_vsan.py | 13 +-- tests/unit/utils/test_win_dacl.py | 4 - tests/unit/utils/test_win_functions.py | 3 +- tests/unit/utils/test_win_lgpo_auditpol.py | 3 +- tests/unit/utils/test_win_lgpo_netsh.py | 2 - tests/unit/utils/test_win_osinfo.py | 5 -- tests/unit/utils/test_win_pdh.py | 2 - tests/unit/utils/test_win_reg.py | 3 +- tests/unit/utils/test_yamldumper.py | 4 +- tests/unit/utils/test_yamlloader.py | 5 +- tests/unit/utils/test_zeromq.py | 3 - tests/unit/utils/test_zfs.py | 5 +- tests/unit/utils/validate/test_net.py | 4 +- 591 files changed, 641 insertions(+), 2369 deletions(-) diff --git a/templates/test_module/tests/unit/modules/test_{{module_name}}.py b/templates/test_module/tests/unit/modules/test_{{module_name}}.py index db532d600c3..8fd4178f0da 100644 --- a/templates/test_module/tests/unit/modules/test_{{module_name}}.py +++ b/templates/test_module/tests/unit/modules/test_{{module_name}}.py @@ -8,16 +8,11 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import ( - patch, - NO_MOCK, - NO_MOCK_REASON -) +from tests.support.unit import TestCase +from tests.support.mock import patch import salt.modules.{{module_name}} as {{module_name}} -@skipIf(NO_MOCK, NO_MOCK_REASON) class {{module_name|capitalize}}TestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/templates/test_state/tests/unit/states/test_{{module_name}}.py b/templates/test_state/tests/unit/states/test_{{module_name}}.py index f3e5ac87e22..c4481ae386e 100644 --- a/templates/test_state/tests/unit/states/test_{{module_name}}.py +++ b/templates/test_state/tests/unit/states/test_{{module_name}}.py @@ -8,17 +8,11 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import ( - patch, - NO_MOCK, - NO_MOCK_REASON -) +from tests.support.unit import TestCase +from tests.support.mock import patch import salt.states.{{module_name}} as {{module_name}} - -@skipIf(NO_MOCK, NO_MOCK_REASON) class {{module_name|capitalize}}TestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/integration/pillar/test_git_pillar.py b/tests/integration/pillar/test_git_pillar.py index 9ade88840bf..034fc5870a3 100644 --- a/tests/integration/pillar/test_git_pillar.py +++ b/tests/integration/pillar/test_git_pillar.py @@ -81,7 +81,6 @@ from tests.support.helpers import ( requires_system_grains, skip_if_not_root ) -from tests.support.mock import NO_MOCK, NO_MOCK_REASON from tests.support.unit import skipIf # Import Salt libs @@ -517,7 +516,6 @@ class GitPythonMixin(object): @destructiveTest -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(_windows_or_mac(), 'minion is windows or mac') @skip_if_not_root @skipIf(not HAS_GITPYTHON, 'GitPython >= {0} required'.format(GITPYTHON_MINVER)) @@ -532,7 +530,6 @@ class TestGitPythonSSH(GitPillarSSHTestBase, GitPythonMixin): passphrase = PASSWORD -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(_windows_or_mac(), 'minion is windows or mac') @skip_if_not_root @skipIf(not HAS_GITPYTHON, 'GitPython >= {0} required'.format(GITPYTHON_MINVER)) @@ -545,7 +542,6 @@ class TestGitPythonHTTP(GitPillarHTTPTestBase, GitPythonMixin): pass -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(_windows_or_mac(), 'minion is windows or mac') @skip_if_not_root @skipIf(not HAS_GITPYTHON, 'GitPython >= {0} required'.format(GITPYTHON_MINVER)) @@ -581,7 +577,6 @@ class TestGitPythonAuthenticatedHTTP(TestGitPythonHTTP, GitPythonMixin): @destructiveTest -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(_windows_or_mac(), 'minion is windows or mac') @skip_if_not_root @skipIf(not HAS_PYGIT2, 'pygit2 >= {0} and libgit2 >= {1} required'.format(PYGIT2_MINVER, LIBGIT2_MINVER)) @@ -1867,7 +1862,6 @@ class TestPygit2SSH(GitPillarSSHTestBase): self.assertEqual(ret, expected) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(_windows_or_mac(), 'minion is windows or mac') @skip_if_not_root @skipIf(not HAS_PYGIT2, 'pygit2 >= {0} and libgit2 >= {1} required'.format(PYGIT2_MINVER, LIBGIT2_MINVER)) @@ -2271,7 +2265,6 @@ class TestPygit2HTTP(GitPillarHTTPTestBase): ) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(_windows_or_mac(), 'minion is windows or mac') @skip_if_not_root @skipIf(not HAS_PYGIT2, 'pygit2 >= {0} and libgit2 >= {1} required'.format(PYGIT2_MINVER, LIBGIT2_MINVER)) diff --git a/tests/support/mixins.py b/tests/support/mixins.py index 1dd68522abd..5a8ec5bef61 100644 --- a/tests/support/mixins.py +++ b/tests/support/mixins.py @@ -26,7 +26,7 @@ import subprocess import multiprocessing # Import Salt Testing Libs -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import patch from tests.support.runtests import RUNTIME_VARS from tests.support.paths import CODE_DIR @@ -423,9 +423,6 @@ class LoaderModuleMockMixin(six.with_metaclass(_FixLoaderModuleMockMixinMroOrder @functools.wraps(setup_func) def wrapper(self): - if NO_MOCK: - self.skipTest(NO_MOCK_REASON) - loader_modules_configs = self.setup_loader_modules() if not isinstance(loader_modules_configs, dict): raise RuntimeError( diff --git a/tests/support/mock.py b/tests/support/mock.py index 38b68bd5c4c..805a60377ca 100644 --- a/tests/support/mock.py +++ b/tests/support/mock.py @@ -25,75 +25,26 @@ import sys from salt.ext import six import salt.utils.stringutils -try: - from mock import ( - Mock, - MagicMock, - patch, - sentinel, - DEFAULT, - # ANY and call will be imported further down - create_autospec, - FILTER_DIR, - NonCallableMock, - NonCallableMagicMock, - PropertyMock, - __version__ - ) - NO_MOCK = False - NO_MOCK_REASON = '' - mock_version = [] - for __part in __version__.split('.'): - try: - mock_version.append(int(__part)) - except ValueError: - # Non-integer value (ex. '1a') - mock_version.append(__part) - mock_version = tuple(mock_version) -except ImportError as exc: - NO_MOCK = True - NO_MOCK_REASON = 'mock python module is unavailable' - mock_version = (0, 0, 0) +# By these days, we should blowup if mock is not available +import mock # pylint: disable=blacklisted-external-import +__mock_version = tuple([int(part) for part in mock.__version__.split('.') if part.isdigit()]) # pylint: disable=no-member +if sys.version_info < (3, 6) and __mock_version < (2,): + # We need mock >= 2.0.0 before Py3.6 + raise ImportError('Please install mock>=2.0.0') - # Let's not fail on imports by providing fake objects and classes - - class MagicMock(object): - - # __name__ can't be assigned a unicode - __name__ = str('{0}.fakemock').format(__name__) # future lint: disable=blacklisted-function - - def __init__(self, *args, **kwargs): - pass - - def dict(self, *args, **kwargs): - return self - - def multiple(self, *args, **kwargs): - return self - - def __call__(self, *args, **kwargs): - return self - - Mock = MagicMock - patch = MagicMock() - sentinel = object() - DEFAULT = object() - create_autospec = MagicMock() - FILTER_DIR = True - NonCallableMock = MagicMock() - NonCallableMagicMock = MagicMock() - mock_open = object() - PropertyMock = object() - call = tuple - ANY = object() - - -if NO_MOCK is False: - try: - from mock import call, ANY - except ImportError: - NO_MOCK = True - NO_MOCK_REASON = 'you need to upgrade your mock version to >= 0.8.0' +from mock import (Mock, # pylint: disable=no-name-in-module,no-member + MagicMock, + patch, + sentinel, + DEFAULT, + create_autospec, + FILTER_DIR, + NonCallableMock, + NonCallableMagicMock, + PropertyMock, + __version__, + ANY, + call) class MockFH(object): diff --git a/tests/unit/auth/test_ldap.py b/tests/unit/auth/test_ldap.py index fb48ce8a56d..5433ba3372a 100644 --- a/tests/unit/auth/test_ldap.py +++ b/tests/unit/auth/test_ldap.py @@ -7,7 +7,7 @@ from __future__ import absolute_import import salt.auth.ldap # Import Salt Testing Libs -from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import patch from tests.support.unit import skipIf, TestCase salt.auth.ldap.__opts__ = {} @@ -28,7 +28,6 @@ class Bind(object): ] -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.auth.ldap.HAS_LDAP, 'Install python-ldap for this test') class LDAPAuthTestCase(TestCase): ''' diff --git a/tests/unit/beacons/test_adb.py b/tests/unit/beacons/test_adb.py index e0d9f738c12..4094d7078ac 100644 --- a/tests/unit/beacons/test_adb.py +++ b/tests/unit/beacons/test_adb.py @@ -4,15 +4,14 @@ from __future__ import absolute_import # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, Mock +from tests.support.unit import TestCase +from tests.support.mock import patch, Mock from tests.support.mixins import LoaderModuleMockMixin # Salt libs import salt.beacons.adb as adb -@skipIf(NO_MOCK, NO_MOCK_REASON) class ADBBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.adb diff --git a/tests/unit/beacons/test_avahi_announce.py b/tests/unit/beacons/test_avahi_announce.py index baf5d0cb3e0..9cdc92b8ea6 100644 --- a/tests/unit/beacons/test_avahi_announce.py +++ b/tests/unit/beacons/test_avahi_announce.py @@ -4,15 +4,13 @@ from __future__ import absolute_import # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase from tests.support.mixins import LoaderModuleMockMixin # Salt libs import salt.beacons.avahi_announce as avahi_announce -@skipIf(NO_MOCK, NO_MOCK_REASON) class AvahiAnnounceBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.avahi_announce diff --git a/tests/unit/beacons/test_bonjour_announce.py b/tests/unit/beacons/test_bonjour_announce.py index f10aa2a42ef..c611784f5b4 100644 --- a/tests/unit/beacons/test_bonjour_announce.py +++ b/tests/unit/beacons/test_bonjour_announce.py @@ -4,15 +4,13 @@ from __future__ import absolute_import # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase from tests.support.mixins import LoaderModuleMockMixin # Salt libs import salt.beacons.bonjour_announce as bonjour_announce -@skipIf(NO_MOCK, NO_MOCK_REASON) class BonjourAnnounceBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.avahi_announce diff --git a/tests/unit/beacons/test_btmp.py b/tests/unit/beacons/test_btmp.py index 0060a035328..e3bb50477d4 100644 --- a/tests/unit/beacons/test_btmp.py +++ b/tests/unit/beacons/test_btmp.py @@ -7,7 +7,7 @@ import logging # Salt testing libs from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock, mock_open +from tests.support.mock import patch, MagicMock, mock_open from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -27,7 +27,6 @@ pack = (6, 29774, b'ssh:notty\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0 log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BTMPBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.[s] diff --git a/tests/unit/beacons/test_diskusage.py b/tests/unit/beacons/test_diskusage.py index ed2ecc65226..41c5deb3d14 100644 --- a/tests/unit/beacons/test_diskusage.py +++ b/tests/unit/beacons/test_diskusage.py @@ -5,8 +5,8 @@ from __future__ import absolute_import from collections import namedtuple # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock, Mock +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock, Mock from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -48,7 +48,6 @@ WINDOWS_STUB_DISK_USAGE = namedtuple('usage', 50) -@skipIf(NO_MOCK, NO_MOCK_REASON) class DiskUsageBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.adb diff --git a/tests/unit/beacons/test_glxinfo.py b/tests/unit/beacons/test_glxinfo.py index 3457b067439..5f356e5bdf1 100644 --- a/tests/unit/beacons/test_glxinfo.py +++ b/tests/unit/beacons/test_glxinfo.py @@ -7,14 +7,13 @@ from __future__ import absolute_import import salt.beacons.glxinfo as glxinfo # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, Mock +from tests.support.unit import TestCase +from tests.support.mock import patch, Mock # Import test suite libs from tests.support.mixins import LoaderModuleMockMixin -@skipIf(NO_MOCK, NO_MOCK_REASON) class GLXInfoBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.glxinfo diff --git a/tests/unit/beacons/test_haproxy.py b/tests/unit/beacons/test_haproxy.py index 34a5a46eecb..fb608c92f29 100644 --- a/tests/unit/beacons/test_haproxy.py +++ b/tests/unit/beacons/test_haproxy.py @@ -4,15 +4,14 @@ from __future__ import absolute_import # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock from tests.support.mixins import LoaderModuleMockMixin # Salt libs import salt.beacons.haproxy as haproxy -@skipIf(NO_MOCK, NO_MOCK_REASON) class HAProxyBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.haproxy diff --git a/tests/unit/beacons/test_journald.py b/tests/unit/beacons/test_journald.py index ee3c6d1c3d8..94bb411be1e 100644 --- a/tests/unit/beacons/test_journald.py +++ b/tests/unit/beacons/test_journald.py @@ -6,8 +6,8 @@ import datetime from uuid import UUID # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock +from tests.support.unit import TestCase +from tests.support.mock import Mock from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -74,7 +74,6 @@ class SystemdJournaldMock(Mock): SYSTEMD_MOCK = SystemdJournaldMock() -@skipIf(NO_MOCK, NO_MOCK_REASON) class JournaldBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.journald diff --git a/tests/unit/beacons/test_load.py b/tests/unit/beacons/test_load.py index 672c301cf6e..2d8df48758b 100644 --- a/tests/unit/beacons/test_load.py +++ b/tests/unit/beacons/test_load.py @@ -5,7 +5,7 @@ from __future__ import absolute_import # Salt testing libs from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.mock import patch, MagicMock from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -16,7 +16,6 @@ import logging log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class LoadBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.load diff --git a/tests/unit/beacons/test_log.py b/tests/unit/beacons/test_log.py index 8551c486734..fadf3721b9d 100644 --- a/tests/unit/beacons/test_log.py +++ b/tests/unit/beacons/test_log.py @@ -4,8 +4,8 @@ from __future__ import absolute_import # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, mock_open +from tests.support.unit import TestCase +from tests.support.mock import patch, mock_open from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -20,7 +20,6 @@ _STUB_LOG_ENTRY = 'Jun 29 12:58:51 hostname sshd[6536]: ' \ 'for user username by (uid=0)\n' -@skipIf(NO_MOCK, NO_MOCK_REASON) class LogBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.log diff --git a/tests/unit/beacons/test_memusage.py b/tests/unit/beacons/test_memusage.py index e3219073d7a..faa81dcb671 100644 --- a/tests/unit/beacons/test_memusage.py +++ b/tests/unit/beacons/test_memusage.py @@ -5,8 +5,8 @@ from __future__ import absolute_import from collections import namedtuple # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -18,7 +18,6 @@ STUB_MEMORY_USAGE = namedtuple('vmem', 'total available percent used free active 1156378624, 4750528512, 898908160) -@skipIf(NO_MOCK, NO_MOCK_REASON) class MemUsageBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.memusage diff --git a/tests/unit/beacons/test_network_info.py b/tests/unit/beacons/test_network_info.py index 0b76c50ecd7..a8726455e14 100644 --- a/tests/unit/beacons/test_network_info.py +++ b/tests/unit/beacons/test_network_info.py @@ -5,8 +5,8 @@ from __future__ import absolute_import from collections import namedtuple # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -25,7 +25,6 @@ STUB_NET_IO_COUNTERS = {'eth0': namedtuple('snetio', 0, 0, 0)} -@skipIf(NO_MOCK, NO_MOCK_REASON) class NetworkInfoBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.network_info diff --git a/tests/unit/beacons/test_network_settings.py b/tests/unit/beacons/test_network_settings.py index 8380dfecdd7..77f09b0e782 100644 --- a/tests/unit/beacons/test_network_settings.py +++ b/tests/unit/beacons/test_network_settings.py @@ -5,7 +5,6 @@ from __future__ import absolute_import # Salt testing libs from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON from tests.support.mixins import LoaderModuleMockMixin try: from pyroute2 import IPDB @@ -20,7 +19,6 @@ import logging log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class NetworkSettingsBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.network_settings diff --git a/tests/unit/beacons/test_ps.py b/tests/unit/beacons/test_ps.py index 2ae5a5735bc..5e7dc11e418 100644 --- a/tests/unit/beacons/test_ps.py +++ b/tests/unit/beacons/test_ps.py @@ -4,8 +4,8 @@ from __future__ import absolute_import # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.unit import TestCase +from tests.support.mock import patch from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -24,7 +24,6 @@ class FakeProcess(object): return self._name -@skipIf(NO_MOCK, NO_MOCK_REASON) class PSBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.[s] diff --git a/tests/unit/beacons/test_salt_proxy.py b/tests/unit/beacons/test_salt_proxy.py index 0cac46ec978..320481bfa4f 100644 --- a/tests/unit/beacons/test_salt_proxy.py +++ b/tests/unit/beacons/test_salt_proxy.py @@ -5,8 +5,8 @@ from __future__ import absolute_import from collections import namedtuple # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -17,7 +17,6 @@ PATCH_OPTS = dict(autospec=True, spec_set=True) FakeProcess = namedtuple('Process', 'cmdline pid') -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltProxyBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.[s] diff --git a/tests/unit/beacons/test_sensehat.py b/tests/unit/beacons/test_sensehat.py index de2d1696d84..9f3e1e14152 100644 --- a/tests/unit/beacons/test_sensehat.py +++ b/tests/unit/beacons/test_sensehat.py @@ -4,15 +4,14 @@ from __future__ import absolute_import # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import MagicMock from tests.support.mixins import LoaderModuleMockMixin # Salt libs import salt.beacons.sensehat as sensehat -@skipIf(NO_MOCK, NO_MOCK_REASON) class SensehatBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.[s] diff --git a/tests/unit/beacons/test_service.py b/tests/unit/beacons/test_service.py index 3f9ac318dc3..d6fd9a8b4ba 100644 --- a/tests/unit/beacons/test_service.py +++ b/tests/unit/beacons/test_service.py @@ -5,8 +5,8 @@ from __future__ import absolute_import from collections import namedtuple # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -17,7 +17,6 @@ PATCH_OPTS = dict(autospec=True, spec_set=True) FakeProcess = namedtuple('Process', 'cmdline pid') -@skipIf(NO_MOCK, NO_MOCK_REASON) class ServiceBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.service diff --git a/tests/unit/beacons/test_smartos_imgadm.py b/tests/unit/beacons/test_smartos_imgadm.py index 8dcf8d11fd9..e80f724f4c9 100644 --- a/tests/unit/beacons/test_smartos_imgadm.py +++ b/tests/unit/beacons/test_smartos_imgadm.py @@ -4,8 +4,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -45,7 +45,6 @@ MOCK_IMAGE_TWO = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class SmartOSImgAdmBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.imgadm diff --git a/tests/unit/beacons/test_smartos_vmadm.py b/tests/unit/beacons/test_smartos_vmadm.py index 61f14dd76bf..5f79f3d4687 100644 --- a/tests/unit/beacons/test_smartos_vmadm.py +++ b/tests/unit/beacons/test_smartos_vmadm.py @@ -4,8 +4,8 @@ from __future__ import absolute_import # Salt testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -52,7 +52,6 @@ MOCK_VM_TWO_STARTED = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class SmartOSImgAdmBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.vmadm diff --git a/tests/unit/beacons/test_telegram_bot_msg.py b/tests/unit/beacons/test_telegram_bot_msg.py index 436a4190022..2ccadf580b6 100644 --- a/tests/unit/beacons/test_telegram_bot_msg.py +++ b/tests/unit/beacons/test_telegram_bot_msg.py @@ -10,7 +10,7 @@ from salt.beacons import telegram_bot_msg # Salt testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Third-party libs try: @@ -24,7 +24,6 @@ log = logging.getLogger(__name__) @skipIf(not HAS_TELEGRAM, 'telegram is not available') -@skipIf(NO_MOCK, NO_MOCK_REASON) class TelegramBotMsgBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.telegram_bot diff --git a/tests/unit/beacons/test_twilio_txt_msg.py b/tests/unit/beacons/test_twilio_txt_msg.py index 5223e06d28d..64e0b548f9d 100644 --- a/tests/unit/beacons/test_twilio_txt_msg.py +++ b/tests/unit/beacons/test_twilio_txt_msg.py @@ -9,7 +9,7 @@ from salt.beacons import twilio_txt_msg # Salt testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Import 3rd Party libs try: @@ -104,7 +104,6 @@ class MockTwilioRestClient(object): @skipIf(not HAS_TWILIO, 'twilio.rest is not available') -@skipIf(NO_MOCK, NO_MOCK_REASON) class TwilioMsgTxtBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.twilio_txt_msg diff --git a/tests/unit/beacons/test_wtmp.py b/tests/unit/beacons/test_wtmp.py index 125930ceec6..81d40ee8ba5 100644 --- a/tests/unit/beacons/test_wtmp.py +++ b/tests/unit/beacons/test_wtmp.py @@ -7,7 +7,7 @@ import logging # Salt testing libs from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock, mock_open +from tests.support.mock import patch, MagicMock, mock_open from tests.support.mixins import LoaderModuleMockMixin # Salt libs @@ -27,7 +27,6 @@ pack = (7, 6216, b'pts/14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0 log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class WTMPBeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.beacons.[s] diff --git a/tests/unit/cache/test_cache.py b/tests/unit/cache/test_cache.py index da943983bd7..81698d5f6b5 100644 --- a/tests/unit/cache/test_cache.py +++ b/tests/unit/cache/test_cache.py @@ -8,12 +8,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs # import integration -from tests.support.unit import skipIf, TestCase -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, - patch, -) +from tests.support.unit import TestCase +from tests.support.mock import patch # Import Salt libs import salt.payload @@ -41,7 +37,6 @@ class CacheFunctionsTest(TestCase): self.assertIsInstance(ret, salt.cache.MemCache) -@skipIf(NO_MOCK, NO_MOCK_REASON) class MemCacheTest(TestCase): ''' Validate Cache class methods diff --git a/tests/unit/cache/test_localfs.py b/tests/unit/cache/test_localfs.py index d0bca2875c3..579dfd468be 100644 --- a/tests/unit/cache/test_localfs.py +++ b/tests/unit/cache/test_localfs.py @@ -12,11 +12,9 @@ import tempfile # Import Salt Testing libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -27,7 +25,6 @@ import salt.cache.localfs as localfs from salt.exceptions import SaltCacheError -@skipIf(NO_MOCK, NO_MOCK_REASON) class LocalFSTest(TestCase, LoaderModuleMockMixin): ''' Validate the functions in the localfs cache diff --git a/tests/unit/cli/test_batch.py b/tests/unit/cli/test_batch.py index fdb2da7d659..acabbe51f56 100644 --- a/tests/unit/cli/test_batch.py +++ b/tests/unit/cli/test_batch.py @@ -10,11 +10,10 @@ from __future__ import absolute_import, print_function, unicode_literals from salt.cli.batch import Batch # Import Salt Testing Libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch -@skipIf(NO_MOCK, NO_MOCK_REASON) class BatchTestCase(TestCase): ''' Unit Tests for the salt.cli.batch module diff --git a/tests/unit/cli/test_daemons.py b/tests/unit/cli/test_daemons.py index b6b0cd4ecb7..e17b9796118 100644 --- a/tests/unit/cli/test_daemons.py +++ b/tests/unit/cli/test_daemons.py @@ -9,8 +9,8 @@ import logging import multiprocessing # Import Salt Testing libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import patch, MagicMock, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock from tests.support.mixins import SaltClientTestCaseMixin # Import Salt libs @@ -223,7 +223,6 @@ def _syndic_exec_test(child_pipe): child_pipe.close() -@skipIf(NO_MOCK, NO_MOCK_REASON) class DaemonsStarterTestCase(TestCase, SaltClientTestCaseMixin): ''' Unit test for the daemons starter classes. diff --git a/tests/unit/client/test_ssh.py b/tests/unit/client/test_ssh.py index 85560ec8bcd..bc75be4003a 100644 --- a/tests/unit/client/test_ssh.py +++ b/tests/unit/client/test_ssh.py @@ -13,7 +13,7 @@ import tempfile from tests.support.runtests import RUNTIME_VARS from tests.support.unit import skipIf, TestCase from tests.support.case import ShellCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.mock import patch, MagicMock # Import Salt libs import salt.config @@ -35,7 +35,6 @@ self: ''' -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.utils.path.which('ssh'), "No ssh binary found in path") class SSHPasswordTests(ShellCase): def test_password_failure(self): @@ -105,7 +104,6 @@ class SSHRosterDefaults(TestCase): shutil.rmtree(tempdir) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SSHSingleTests(TestCase): def setUp(self): self.tmp_cachedir = tempfile.mkdtemp(dir=RUNTIME_VARS.TMP) diff --git a/tests/unit/cloud/clouds/test_dimensiondata.py b/tests/unit/cloud/clouds/test_dimensiondata.py index e912ed61934..08ae5fe1fd0 100644 --- a/tests/unit/cloud/clouds/test_dimensiondata.py +++ b/tests/unit/cloud/clouds/test_dimensiondata.py @@ -23,7 +23,7 @@ from salt.utils.versions import LooseVersion # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch, __version__ as mock_version +from tests.support.mock import MagicMock, patch, __version__ as mock_version from tests.unit.cloud.clouds import _preferred_ip VM_NAME = 'winterfell' @@ -57,7 +57,6 @@ class ExtendedTestCase(TestCase): self.assertEqual(exc.message, exc_msg) -@skipIf(NO_MOCK, NO_MOCK_REASON) class DimensionDataTestCase(ExtendedTestCase, LoaderModuleMockMixin): ''' Unit TestCase for salt.cloud.clouds.dimensiondata module. diff --git a/tests/unit/cloud/clouds/test_ec2.py b/tests/unit/cloud/clouds/test_ec2.py index 01b2591a632..4b2cdc7296b 100644 --- a/tests/unit/cloud/clouds/test_ec2.py +++ b/tests/unit/cloud/clouds/test_ec2.py @@ -14,7 +14,7 @@ import salt.utils.files from tests.support.runtests import RUNTIME_VARS from tests.support.unit import TestCase, skipIf from tests.support.mixins import LoaderModuleMockMixin -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, PropertyMock +from tests.support.mock import patch, PropertyMock from tests.unit.test_crypt import PRIVKEY_DATA PASS_DATA = ( @@ -26,7 +26,6 @@ PASS_DATA = ( ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class EC2TestCase(TestCase, LoaderModuleMockMixin): ''' Unit TestCase for salt.cloud.clouds.ec2 module. diff --git a/tests/unit/cloud/clouds/test_gce.py b/tests/unit/cloud/clouds/test_gce.py index 88210abdd65..1e3cac3dfd2 100644 --- a/tests/unit/cloud/clouds/test_gce.py +++ b/tests/unit/cloud/clouds/test_gce.py @@ -22,8 +22,8 @@ from salt.utils.versions import LooseVersion # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, __version__ as mock_version +from tests.support.unit import TestCase +from tests.support.mock import patch, __version__ as mock_version VM_NAME = 'kings_landing' DUMMY_TOKEN = { @@ -48,7 +48,6 @@ except ImportError: pass -@skipIf(NO_MOCK, NO_MOCK_REASON) class GCETestCase(TestCase, LoaderModuleMockMixin): ''' Unit TestCase for salt.cloud.clouds.gce module. diff --git a/tests/unit/cloud/clouds/test_joyent.py b/tests/unit/cloud/clouds/test_joyent.py index 30f997b1427..5534a7b0456 100644 --- a/tests/unit/cloud/clouds/test_joyent.py +++ b/tests/unit/cloud/clouds/test_joyent.py @@ -12,8 +12,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -34,7 +32,6 @@ def fake_wait_for_ip(check_for_ip_fn, return check_for_ip_fn() -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(joyent.HAS_REQUIRED_CRYPTO is False, reason='PyCrypto or Cryptodome not installed') class JoyentTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/cloud/clouds/test_linode.py b/tests/unit/cloud/clouds/test_linode.py index e186dc9d820..e1782b41908 100644 --- a/tests/unit/cloud/clouds/test_linode.py +++ b/tests/unit/cloud/clouds/test_linode.py @@ -8,14 +8,12 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase # Import Salt Libs from salt.cloud.clouds import linode -@skipIf(NO_MOCK, NO_MOCK_REASON) class LinodeTestCase(TestCase, LoaderModuleMockMixin): ''' Unit TestCase for the salt.cloud.clouds.linode module. diff --git a/tests/unit/cloud/clouds/test_opennebula.py b/tests/unit/cloud/clouds/test_opennebula.py index dc57614b312..c517a06f2de 100644 --- a/tests/unit/cloud/clouds/test_opennebula.py +++ b/tests/unit/cloud/clouds/test_opennebula.py @@ -9,7 +9,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import MagicMock, patch # Import Salt Libs from salt.cloud.clouds import opennebula @@ -25,7 +25,6 @@ except ImportError: VM_NAME = 'my-vm' -@skipIf(NO_MOCK, NO_MOCK_REASON) class OpenNebulaTestCase(TestCase, LoaderModuleMockMixin): ''' Unit TestCase for salt.cloud.clouds.opennebula module. diff --git a/tests/unit/cloud/clouds/test_openstack.py b/tests/unit/cloud/clouds/test_openstack.py index 34e1298ef66..59ae1bdb181 100644 --- a/tests/unit/cloud/clouds/test_openstack.py +++ b/tests/unit/cloud/clouds/test_openstack.py @@ -14,8 +14,8 @@ from salt.cloud.clouds import openstack # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.unit import TestCase +from tests.support.mock import patch class MockImage(object): @@ -53,7 +53,6 @@ class MockConn(object): return [self.node] -@skipIf(NO_MOCK, NO_MOCK_REASON) class OpenstackTestCase(TestCase, LoaderModuleMockMixin): ''' Unit TestCase for salt.cloud.clouds.openstack module. diff --git a/tests/unit/cloud/clouds/test_saltify.py b/tests/unit/cloud/clouds/test_saltify.py index 719f3e5f6b6..0d8a6c15d4e 100644 --- a/tests/unit/cloud/clouds/test_saltify.py +++ b/tests/unit/cloud/clouds/test_saltify.py @@ -8,8 +8,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch, ANY +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch, ANY # Import Salt Libs @@ -32,7 +32,6 @@ TEST_PROFILES = { TEST_PROFILE_NAMES = ['testprofile1', 'testprofile2', 'testprofile3'] -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltifyTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.cloud.clouds.saltify diff --git a/tests/unit/cloud/clouds/test_vmware.py b/tests/unit/cloud/clouds/test_vmware.py index 3887ee0982a..f6dbf8957d6 100644 --- a/tests/unit/cloud/clouds/test_vmware.py +++ b/tests/unit/cloud/clouds/test_vmware.py @@ -13,7 +13,7 @@ from copy import deepcopy # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import MagicMock, patch # Import Salt Libs from salt import config @@ -74,7 +74,6 @@ class ExtendedTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(exc.message, exc_msg) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_LIBS, 'Install pyVmomi to be able to run this test.') class VMwareTestCase(ExtendedTestCase): ''' diff --git a/tests/unit/daemons/test_masterapi.py b/tests/unit/daemons/test_masterapi.py index 7347cd920ff..3076a257d53 100644 --- a/tests/unit/daemons/test_masterapi.py +++ b/tests/unit/daemons/test_masterapi.py @@ -14,12 +14,10 @@ import salt.utils.platform # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) @@ -59,7 +57,6 @@ def patch_check_permissions(uid=1, groups=None, is_windows=False, permissive_pki return decorator -@skipIf(NO_MOCK, NO_MOCK_REASON) class AutoKeyTest(TestCase): ''' Tests for the salt.daemons.masterapi.AutoKey class @@ -241,7 +238,6 @@ class AutoKeyTest(TestCase): self._test_check_autosign_grains(test_func, file_content=file_content, permissions_ret=False) -@skipIf(NO_MOCK, NO_MOCK_REASON) class LocalFuncsTestCase(TestCase): ''' TestCase for salt.daemons.masterapi.LocalFuncs class diff --git a/tests/unit/engines/test_libvirt_events.py b/tests/unit/engines/test_libvirt_events.py index 223b1b5d68c..d9143a320b1 100644 --- a/tests/unit/engines/test_libvirt_events.py +++ b/tests/unit/engines/test_libvirt_events.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -21,7 +19,6 @@ import salt.engines.libvirt_events as libvirt_events # pylint: disable=protected-access,attribute-defined-outside-init,invalid-name,unused-argument,no-self-use -@skipIf(NO_MOCK, NO_MOCK_REASON) class EngineLibvirtEventTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.engine.libvirt_events diff --git a/tests/unit/engines/test_slack.py b/tests/unit/engines/test_slack.py index ef228a8fa6f..98502aea5a8 100644 --- a/tests/unit/engines/test_slack.py +++ b/tests/unit/engines/test_slack.py @@ -9,8 +9,6 @@ from __future__ import absolute_import, print_function, unicode_literals from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -20,7 +18,6 @@ import salt.config @skipIf(slack.HAS_SLACKCLIENT is False, 'The SlackClient is not installed') -@skipIf(NO_MOCK, NO_MOCK_REASON) class EngineSlackTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.engine.sqs_events diff --git a/tests/unit/engines/test_sqs_events.py b/tests/unit/engines/test_sqs_events.py index 4a405ac73fe..196300cc820 100644 --- a/tests/unit/engines/test_sqs_events.py +++ b/tests/unit/engines/test_sqs_events.py @@ -9,8 +9,6 @@ from __future__ import absolute_import, print_function, unicode_literals from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ import salt.engines.sqs_events as sqs_events @skipIf(sqs_events.HAS_BOTO is False, 'The boto library is not installed') -@skipIf(NO_MOCK, NO_MOCK_REASON) class EngineSqsEventTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.engine.sqs_events diff --git a/tests/unit/fileserver/test_gitfs.py b/tests/unit/fileserver/test_gitfs.py index 3477ef1e1f3..03fcb27ed80 100644 --- a/tests/unit/fileserver/test_gitfs.py +++ b/tests/unit/fileserver/test_gitfs.py @@ -22,7 +22,7 @@ except ImportError: from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import patch from tests.support.helpers import patched_environ # Import salt libs @@ -475,7 +475,6 @@ class GitFSTestBase(object): @skipIf(not HAS_GITPYTHON, 'GitPython >= {0} required'.format(GITPYTHON_MINVER)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class GitPythonTest(GitFSTestBase, GitFSTestFuncs, TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): @@ -522,7 +521,6 @@ class GitPythonTest(GitFSTestBase, GitFSTestFuncs, TestCase, LoaderModuleMockMix @skipIf(not HAS_GITPYTHON, 'GitPython >= {0} required for temp repo setup'.format(GITPYTHON_MINVER)) @skipIf(not HAS_PYGIT2, 'pygit2 >= {0} and libgit2 >= {1} required'.format(PYGIT2_MINVER, LIBGIT2_MINVER)) @skipIf(salt.utils.platform.is_windows(), 'Skip Pygit2 on windows, due to pygit2 access error on windows') -@skipIf(NO_MOCK, NO_MOCK_REASON) class Pygit2Test(GitFSTestBase, GitFSTestFuncs, TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py index 7e648eccb58..e0d939a0861 100644 --- a/tests/unit/fileserver/test_roots.py +++ b/tests/unit/fileserver/test_roots.py @@ -11,8 +11,8 @@ import tempfile # Import Salt Testing libs from tests.support.mixins import AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import patch from tests.support.runtests import RUNTIME_VARS # Import Salt libs @@ -31,7 +31,6 @@ UNICODE_FILENAME = 'питон.txt' UNICODE_DIRNAME = UNICODE_ENVNAME = 'соль' -@skipIf(NO_MOCK, NO_MOCK_REASON) class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py index 6b1955c2a02..86f7717d322 100644 --- a/tests/unit/grains/test_core.py +++ b/tests/unit/grains/test_core.py @@ -24,8 +24,6 @@ from tests.support.mock import ( MagicMock, patch, mock_open, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -58,7 +56,6 @@ OS_RELEASE_DIR = os.path.join(os.path.dirname(__file__), "os-releases") SOLARIS_DIR = os.path.join(os.path.dirname(__file__), 'solaris') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not pytest, False) class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/grains/test_disks.py b/tests/unit/grains/test_disks.py index 635e0194418..9b23f1e8bc8 100644 --- a/tests/unit/grains/test_disks.py +++ b/tests/unit/grains/test_disks.py @@ -8,19 +8,16 @@ import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.grains.disks as disks -@skipIf(NO_MOCK, NO_MOCK_REASON) class IscsiGrainsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for _windows_disks grains diff --git a/tests/unit/grains/test_fibre_channel.py b/tests/unit/grains/test_fibre_channel.py index 4481079c5e4..a7d9058f6a2 100644 --- a/tests/unit/grains/test_fibre_channel.py +++ b/tests/unit/grains/test_fibre_channel.py @@ -6,20 +6,17 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, mock_open, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.grains.fibre_channel as fibre_channel -@skipIf(NO_MOCK, NO_MOCK_REASON) class FibreChannelGrainsTestCase(TestCase): ''' Test cases for iscsi grains diff --git a/tests/unit/grains/test_iscsi.py b/tests/unit/grains/test_iscsi.py index 93adfeb708d..168ea0746e4 100644 --- a/tests/unit/grains/test_iscsi.py +++ b/tests/unit/grains/test_iscsi.py @@ -8,20 +8,17 @@ import errno import textwrap # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, mock_open, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.grains.iscsi as iscsi -@skipIf(NO_MOCK, NO_MOCK_REASON) class IscsiGrainsTestCase(TestCase): ''' Test cases for iscsi grains diff --git a/tests/unit/grains/test_napalm.py b/tests/unit/grains/test_napalm.py index 63f19007211..3446975a51a 100644 --- a/tests/unit/grains/test_napalm.py +++ b/tests/unit/grains/test_napalm.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -35,7 +33,6 @@ TEST_CACHE = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) @patch('salt.grains.napalm.DEVICE_CACHE', TEST_DEVICE_CACHE) @patch('salt.grains.napalm.GRAINS_CACHE', TEST_CACHE) class NapalmGrainsTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/grains/test_nvme.py b/tests/unit/grains/test_nvme.py index aaa2f0004cf..c323e425506 100644 --- a/tests/unit/grains/test_nvme.py +++ b/tests/unit/grains/test_nvme.py @@ -8,20 +8,17 @@ import errno import textwrap # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, mock_open, - MagicMock, - NO_MOCK, - NO_MOCK_REASON + MagicMock ) # Import Salt Libs import salt.grains.nvme as nvme -@skipIf(NO_MOCK, NO_MOCK_REASON) class NvmeGrainsTestCase(TestCase): ''' Test cases for nvme grains diff --git a/tests/unit/modules/inspectlib/test_collector.py b/tests/unit/modules/inspectlib/test_collector.py index 28e298a0dd4..677d0357e7f 100644 --- a/tests/unit/modules/inspectlib/test_collector.py +++ b/tests/unit/modules/inspectlib/test_collector.py @@ -26,15 +26,12 @@ from tests.support.helpers import no_symlinks from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import salt libs from salt.modules.inspectlib.collector import Inspector -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(no_symlinks(), "Git missing 'core.symlinks=true' config") class InspectorCollectorTestCase(TestCase): ''' diff --git a/tests/unit/modules/test_aliases.py b/tests/unit/modules/test_aliases.py index 21cb020062d..a9217393ffc 100644 --- a/tests/unit/modules/test_aliases.py +++ b/tests/unit/modules/test_aliases.py @@ -12,11 +12,10 @@ from salt.exceptions import SaltInvocationError # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch -@skipIf(NO_MOCK, NO_MOCK_REASON) class AliasesTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.aliases module diff --git a/tests/unit/modules/test_alternatives.py b/tests/unit/modules/test_alternatives.py index 7b15979838d..06ac44d9eb9 100644 --- a/tests/unit/modules/test_alternatives.py +++ b/tests/unit/modules/test_alternatives.py @@ -11,16 +11,15 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs -from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.helpers import TstSuiteLoggingHandler -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mixins import LoaderModuleMockMixin +from tests.support.mock import MagicMock, patch # Import salt libs import salt.modules.alternatives as alternatives -@skipIf(NO_MOCK, NO_MOCK_REASON) class AlternativesTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_ansiblegate.py b/tests/unit/modules/test_ansiblegate.py index 1fbb083eb75..5613a0e79b3 100644 --- a/tests/unit/modules/test_ansiblegate.py +++ b/tests/unit/modules/test_ansiblegate.py @@ -29,8 +29,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import salt.modules.ansiblegate as ansible @@ -38,7 +36,6 @@ import salt.utils.platform from salt.exceptions import LoaderError -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(NO_PYTEST, False) @skipIf(salt.utils.platform.is_windows(), 'Not supported on Windows') class AnsiblegateTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/modules/test_apache.py b/tests/unit/modules/test_apache.py index 7e6511223a1..accf112304a 100644 --- a/tests/unit/modules/test_apache.py +++ b/tests/unit/modules/test_apache.py @@ -8,13 +8,11 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, mock_open, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -23,7 +21,6 @@ from salt.ext.six.moves.urllib.error import URLError # pylint: disable=import-e from salt.utils.odict import OrderedDict -@skipIf(NO_MOCK, NO_MOCK_REASON) class ApacheTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.apache diff --git a/tests/unit/modules/test_aptpkg.py b/tests/unit/modules/test_aptpkg.py index 3fcd974aead..c5e5310357a 100644 --- a/tests/unit/modules/test_aptpkg.py +++ b/tests/unit/modules/test_aptpkg.py @@ -14,7 +14,7 @@ import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import Mock, MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import Mock, MagicMock, patch # Import Salt Libs from salt.ext import six @@ -158,7 +158,6 @@ UNINSTALL = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class AptPkgTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.aptpkg diff --git a/tests/unit/modules/test_archive.py b/tests/unit/modules/test_archive.py index 66e7da93c97..d0a402e395d 100644 --- a/tests/unit/modules/test_archive.py +++ b/tests/unit/modules/test_archive.py @@ -14,7 +14,7 @@ import os.path # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Import salt libs import salt.modules.archive as archive @@ -37,7 +37,6 @@ class ZipFileMock(MagicMock): return self._files -@skipIf(NO_MOCK, NO_MOCK_REASON) class ArchiveTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_artifactory.py b/tests/unit/modules/test_artifactory.py index 865e37c57c3..67bcf67a6c3 100644 --- a/tests/unit/modules/test_artifactory.py +++ b/tests/unit/modules/test_artifactory.py @@ -5,14 +5,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt libs import salt.modules.artifactory as artifactory -@skipIf(NO_MOCK, NO_MOCK_REASON) class ArtifactoryTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_at.py b/tests/unit/modules/test_at.py index d8b1ebf86ae..0b5978a2b01 100644 --- a/tests/unit/modules/test_at.py +++ b/tests/unit/modules/test_at.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.utils.path import salt.modules.at as at -@skipIf(NO_MOCK, NO_MOCK_REASON) class AtTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for the salt.modules.at module diff --git a/tests/unit/modules/test_azurearm_dns.py b/tests/unit/modules/test_azurearm_dns.py index 2135fe17419..c641a399df9 100644 --- a/tests/unit/modules/test_azurearm_dns.py +++ b/tests/unit/modules/test_azurearm_dns.py @@ -13,11 +13,7 @@ import salt.modules.azurearm_dns as azurearm_dns # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import ( - MagicMock, - NO_MOCK, - NO_MOCK_REASON -) +from tests.support.mock import MagicMock # Azure libs # pylint: disable=import-error @@ -111,7 +107,6 @@ class AzureClientMock(object): return MagicMock(return_value=self.__return_value)() -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_LIBS is False, 'The azure.mgmt.dns module must be installed.') class AzureRmDnsTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_beacons.py b/tests/unit/modules/test_beacons.py index 20cb6cb640f..fd1eaf34ca4 100644 --- a/tests/unit/modules/test_beacons.py +++ b/tests/unit/modules/test_beacons.py @@ -10,12 +10,10 @@ import os # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -23,7 +21,6 @@ import salt.modules.beacons as beacons from salt.utils.event import SaltEvent -@skipIf(NO_MOCK, NO_MOCK_REASON) class BeaconsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.beacons diff --git a/tests/unit/modules/test_bluez_bluetooth.py b/tests/unit/modules/test_bluez_bluetooth.py index f9ac979cab4..78b5cfcf9fc 100644 --- a/tests/unit/modules/test_bluez_bluetooth.py +++ b/tests/unit/modules/test_bluez_bluetooth.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -37,7 +35,6 @@ class MockBluetooth(object): return [['a', 'b', 'c'], ['d', 'e', 'f']] -@skipIf(NO_MOCK, NO_MOCK_REASON) class BluezTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.bluez diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py index 0f88f1d9b22..ac36d2c23ce 100644 --- a/tests/unit/modules/test_boto_apigateway.py +++ b/tests/unit/modules/test_boto_apigateway.py @@ -10,7 +10,7 @@ import string # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Import Salt libs import salt.loader @@ -232,7 +232,6 @@ class BotoApiGatewayTestCaseMixin(object): @skipIf(_has_required_botocore() is False, 'The botocore module must be greater than' ' or equal to version {0}'.format(required_botocore_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoApiGatewayTestCase(BotoApiGatewayTestCaseBase, BotoApiGatewayTestCaseMixin): ''' TestCase for salt.modules.boto_apigateway module diff --git a/tests/unit/modules/test_boto_cloudtrail.py b/tests/unit/modules/test_boto_cloudtrail.py index 2f06476c829..f044bed6431 100644 --- a/tests/unit/modules/test_boto_cloudtrail.py +++ b/tests/unit/modules/test_boto_cloudtrail.py @@ -11,8 +11,6 @@ from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -97,7 +95,6 @@ if _has_required_boto(): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoCloudTrailTestCaseBase(TestCase, LoaderModuleMockMixin): conn = None diff --git a/tests/unit/modules/test_boto_cloudwatch_event.py b/tests/unit/modules/test_boto_cloudwatch_event.py index f016fc5617c..a191b9be4d8 100644 --- a/tests/unit/modules/test_boto_cloudwatch_event.py +++ b/tests/unit/modules/test_boto_cloudwatch_event.py @@ -11,8 +11,6 @@ from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -125,7 +123,6 @@ class BotoCloudWatchEventTestCaseMixin(object): @skipIf(HAS_BOTO is False, 'The boto module must be installed.') -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoCloudWatchEventTestCase(BotoCloudWatchEventTestCaseBase, BotoCloudWatchEventTestCaseMixin): ''' TestCase for salt.modules.boto_cloudwatch_event module diff --git a/tests/unit/modules/test_boto_cognitoidentity.py b/tests/unit/modules/test_boto_cognitoidentity.py index bde2ae2da79..2661547b32a 100644 --- a/tests/unit/modules/test_boto_cognitoidentity.py +++ b/tests/unit/modules/test_boto_cognitoidentity.py @@ -9,7 +9,7 @@ import string # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Import Salt libs import salt.config @@ -154,7 +154,6 @@ class BotoCognitoIdentityTestCaseMixin(object): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoCognitoIdentityTestCase(BotoCognitoIdentityTestCaseBase, BotoCognitoIdentityTestCaseMixin): ''' TestCase for salt.modules.boto_cognitoidentity module diff --git a/tests/unit/modules/test_boto_elasticsearch_domain.py b/tests/unit/modules/test_boto_elasticsearch_domain.py index 1fa1e7ba7c4..50c826d0d36 100644 --- a/tests/unit/modules/test_boto_elasticsearch_domain.py +++ b/tests/unit/modules/test_boto_elasticsearch_domain.py @@ -11,8 +11,6 @@ import string from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -126,7 +124,6 @@ class BotoElasticsearchDomainTestCaseMixin(object): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoElasticsearchDomainTestCase(BotoElasticsearchDomainTestCaseBase, BotoElasticsearchDomainTestCaseMixin): ''' TestCase for salt.modules.boto_elasticsearch_domain module diff --git a/tests/unit/modules/test_boto_elb.py b/tests/unit/modules/test_boto_elb.py index dab5c0e034e..b84f8b8805b 100644 --- a/tests/unit/modules/test_boto_elb.py +++ b/tests/unit/modules/test_boto_elb.py @@ -60,7 +60,6 @@ import salt.utils.versions # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON log = logging.getLogger(__name__) @@ -93,7 +92,6 @@ def _has_required_moto(): return True -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_moto() is False, 'The moto module must be >= to {0} for ' diff --git a/tests/unit/modules/test_boto_iot.py b/tests/unit/modules/test_boto_iot.py index 4d2025d6381..7b14bd57b0c 100644 --- a/tests/unit/modules/test_boto_iot.py +++ b/tests/unit/modules/test_boto_iot.py @@ -11,8 +11,6 @@ from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -122,7 +120,6 @@ if _has_required_boto(): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoIoTTestCaseBase(TestCase, LoaderModuleMockMixin): conn = None @@ -635,7 +632,6 @@ class BotoIoTPolicyTestCase(BotoIoTTestCaseBase, BotoIoTTestCaseMixin): ' module must be greater than or equal to' ' version {1}.' .format(required_boto3_version, required_botocore_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoIoTTopicRuleTestCase(BotoIoTTestCaseBase, BotoIoTTestCaseMixin): ''' TestCase for salt.modules.boto_iot module diff --git a/tests/unit/modules/test_boto_lambda.py b/tests/unit/modules/test_boto_lambda.py index cf3f6a6c3b9..bb37484ade9 100644 --- a/tests/unit/modules/test_boto_lambda.py +++ b/tests/unit/modules/test_boto_lambda.py @@ -19,8 +19,6 @@ from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -117,7 +115,6 @@ def _has_required_boto(): ('The boto3 module must be greater than or equal to version {0}, ' 'and botocore must be greater than or equal to {1}'.format( required_boto3_version, required_botocore_version))) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoLambdaTestCaseBase(TestCase, LoaderModuleMockMixin): conn = None @@ -468,7 +465,6 @@ class BotoLambdaFunctionTestCase(BotoLambdaTestCaseBase, BotoLambdaTestCaseMixin @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoLambdaAliasTestCase(BotoLambdaTestCaseBase, BotoLambdaTestCaseMixin): ''' TestCase for salt.modules.boto_lambda module aliases @@ -619,7 +615,6 @@ class BotoLambdaAliasTestCase(BotoLambdaTestCaseBase, BotoLambdaTestCaseMixin): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoLambdaEventSourceMappingTestCase(BotoLambdaTestCaseBase, BotoLambdaTestCaseMixin): ''' TestCase for salt.modules.boto_lambda module mappings diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py index af955dcbdc4..a01e29c7f7a 100644 --- a/tests/unit/modules/test_boto_route53.py +++ b/tests/unit/modules/test_boto_route53.py @@ -18,7 +18,6 @@ import salt.utils.versions # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON from tests.support.runtests import RUNTIME_VARS # import Python Third Party Libs @@ -66,7 +65,6 @@ def _has_required_moto(): return True -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_moto() is False, 'The moto module must be >= to {0} for ' 'PY2 or {1} for PY3.'.format(required_moto, required_moto_py3)) diff --git a/tests/unit/modules/test_boto_s3_bucket.py b/tests/unit/modules/test_boto_s3_bucket.py index 54868878438..ab990a81c1d 100644 --- a/tests/unit/modules/test_boto_s3_bucket.py +++ b/tests/unit/modules/test_boto_s3_bucket.py @@ -12,8 +12,6 @@ from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -200,7 +198,6 @@ if _has_required_boto(): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoS3BucketTestCaseBase(TestCase, LoaderModuleMockMixin): conn = None diff --git a/tests/unit/modules/test_boto_secgroup.py b/tests/unit/modules/test_boto_secgroup.py index 9990946b06b..76eb5aa0e96 100644 --- a/tests/unit/modules/test_boto_secgroup.py +++ b/tests/unit/modules/test_boto_secgroup.py @@ -11,7 +11,6 @@ import sys # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON from tests.support.runtests import RUNTIME_VARS # Import Salt libs @@ -83,7 +82,6 @@ def _has_required_boto(): return True -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' diff --git a/tests/unit/modules/test_boto_vpc.py b/tests/unit/modules/test_boto_vpc.py index 6b61c4811de..2c147d029f0 100644 --- a/tests/unit/modules/test_boto_vpc.py +++ b/tests/unit/modules/test_boto_vpc.py @@ -17,7 +17,7 @@ from pkg_resources import DistributionNotFound # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch from tests.support.runtests import RUNTIME_VARS # Import Salt libs @@ -128,7 +128,6 @@ def _has_required_moto(): return True -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -586,7 +585,6 @@ class BotoVpcTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): boto_vpc.describe(vpc_id=None, **conn_parameters) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -890,7 +888,6 @@ class BotoVpcSubnetsTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): self.assertEqual(describe_subnet_results['subnets'][0]['availability_zone'], 'us-east-1a') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -952,7 +949,6 @@ class BotoVpcInternetGatewayTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): self.assertTrue(igw_creation_result.get('created')) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -1002,7 +998,6 @@ class BotoVpcNatGatewayTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): self.assertTrue(ngw_creation_result.get('created')) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -1040,7 +1035,6 @@ class BotoVpcCustomerGatewayTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): self.assertFalse(gw_exists_result['exists']) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -1209,7 +1203,6 @@ class BotoVpcDHCPOptionsTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): boto_vpc.dhcp_options_exists(**conn_parameters) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -1572,7 +1565,6 @@ class BotoVpcNetworkACLTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): self.assertFalse(dhcp_disassociate_result) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -1792,7 +1784,6 @@ class BotoVpcRouteTablesTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): self.assertFalse(route_replacing_result) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' diff --git a/tests/unit/modules/test_bower.py b/tests/unit/modules/test_bower.py index 1daa650eeda..381a04a3d77 100644 --- a/tests/unit/modules/test_bower.py +++ b/tests/unit/modules/test_bower.py @@ -8,15 +8,14 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.modules.bower as bower from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class BowerTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.bower diff --git a/tests/unit/modules/test_bridge.py b/tests/unit/modules/test_bridge.py index 53ea4cd1c00..fba8cc3785b 100644 --- a/tests/unit/modules/test_bridge.py +++ b/tests/unit/modules/test_bridge.py @@ -8,14 +8,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.modules.bridge as bridge -@skipIf(NO_MOCK, NO_MOCK_REASON) class BridgeTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.bridge diff --git a/tests/unit/modules/test_btrfs.py b/tests/unit/modules/test_btrfs.py index ebd28a64518..0ff1a6975e1 100644 --- a/tests/unit/modules/test_btrfs.py +++ b/tests/unit/modules/test_btrfs.py @@ -7,13 +7,11 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( mock_open, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -23,7 +21,6 @@ import salt.modules.btrfs as btrfs from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class BtrfsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.btrfs diff --git a/tests/unit/modules/test_cassandra.py b/tests/unit/modules/test_cassandra.py index dfc6bee507e..4f561682ef4 100644 --- a/tests/unit/modules/test_cassandra.py +++ b/tests/unit/modules/test_cassandra.py @@ -7,12 +7,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -20,7 +18,6 @@ from salt.ext import six import salt.modules.cassandra as cassandra -@skipIf(NO_MOCK, NO_MOCK_REASON) class CassandraTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.cassandra diff --git a/tests/unit/modules/test_chef.py b/tests/unit/modules/test_chef.py index c85a7e91a24..6dff5113437 100644 --- a/tests/unit/modules/test_chef.py +++ b/tests/unit/modules/test_chef.py @@ -7,19 +7,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.chef as chef -@skipIf(NO_MOCK, NO_MOCK_REASON) class ChefTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.chef diff --git a/tests/unit/modules/test_chroot.py b/tests/unit/modules/test_chroot.py index f4e75a99f1f..de3041e98fb 100644 --- a/tests/unit/modules/test_chroot.py +++ b/tests/unit/modules/test_chroot.py @@ -33,12 +33,7 @@ import sys # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import ( - MagicMock, - NO_MOCK, - NO_MOCK_REASON, - patch, -) +from tests.support.mock import MagicMock, patch from salt.exceptions import CommandExecutionError import salt.utils.platform @@ -46,7 +41,6 @@ import salt.modules.chroot as chroot @skipIf(salt.utils.platform.is_windows(), 'This test cannot work on Windows') -@skipIf(NO_MOCK, NO_MOCK_REASON) class ChrootTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.chroot diff --git a/tests/unit/modules/test_cmdmod.py b/tests/unit/modules/test_cmdmod.py index 6598c15d6d1..af3aebe302e 100644 --- a/tests/unit/modules/test_cmdmod.py +++ b/tests/unit/modules/test_cmdmod.py @@ -25,8 +25,6 @@ from tests.support.mock import ( mock_open, Mock, MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -69,7 +67,6 @@ class MockTimedProc(object): return self._stderr -@skipIf(NO_MOCK, NO_MOCK_REASON) class CMDMODTestCase(TestCase, LoaderModuleMockMixin): ''' Unit tests for the salt.modules.cmdmod module diff --git a/tests/unit/modules/test_composer.py b/tests/unit/modules/test_composer.py index 774ff604b3a..2663e3a92e5 100644 --- a/tests/unit/modules/test_composer.py +++ b/tests/unit/modules/test_composer.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.composer as composer from salt.exceptions import CommandExecutionError, CommandNotFoundError, SaltInvocationError -@skipIf(NO_MOCK, NO_MOCK_REASON) class ComposerTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.composer diff --git a/tests/unit/modules/test_config.py b/tests/unit/modules/test_config.py index b87e987a490..0c9ea37d5ea 100644 --- a/tests/unit/modules/test_config.py +++ b/tests/unit/modules/test_config.py @@ -5,8 +5,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.unit import TestCase +from tests.support.mock import patch # Import Salt libs import salt.modules.config as config @@ -17,7 +17,6 @@ DEFAULTS = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestModulesConfig(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_cp.py b/tests/unit/modules/test_cp.py index a49257ad420..d3154cd887a 100644 --- a/tests/unit/modules/test_cp.py +++ b/tests/unit/modules/test_cp.py @@ -8,14 +8,12 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( Mock, MagicMock, mock_open, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -27,7 +25,6 @@ import salt.modules.cp as cp from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class CpTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.cp module diff --git a/tests/unit/modules/test_cpan.py b/tests/unit/modules/test_cpan.py index 3841e156844..648a7fb1d34 100644 --- a/tests/unit/modules/test_cpan.py +++ b/tests/unit/modules/test_cpan.py @@ -7,18 +7,15 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.cpan as cpan -@skipIf(NO_MOCK, NO_MOCK_REASON) class CpanTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.cpan diff --git a/tests/unit/modules/test_cron.py b/tests/unit/modules/test_cron.py index e48e0ab4c23..90cd0312990 100644 --- a/tests/unit/modules/test_cron.py +++ b/tests/unit/modules/test_cron.py @@ -8,8 +8,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch, call +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch, call # Import Salt libs import salt.modules.cron as cron @@ -60,7 +60,6 @@ def write_crontab(*args, **kw): return MagicMock() -@skipIf(NO_MOCK, NO_MOCK_REASON) class CronTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): @@ -878,7 +877,6 @@ class CronTestCase(TestCase, LoaderModuleMockMixin): python_shell=False) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PsTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_cyg.py b/tests/unit/modules/test_cyg.py index 7d2f3c273d1..6bc1252b696 100644 --- a/tests/unit/modules/test_cyg.py +++ b/tests/unit/modules/test_cyg.py @@ -5,7 +5,7 @@ # # Import Salt Testing libs # from tests.support.unit import skipIf, TestCase -# from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +# from tests.support.mock import MagicMock, patch # # Import salt libs # import salt.modules.cyg as cyg @@ -13,7 +13,6 @@ # cyg.__salt__ = {} -# @skipIf(NO_MOCK, NO_MOCK_REASON) # class TestcygModule(TestCase): # def test__get_cyg_dir(self): diff --git a/tests/unit/modules/test_daemontools.py b/tests/unit/modules/test_daemontools.py index 65728b1ec1b..0e5fa558ec7 100644 --- a/tests/unit/modules/test_daemontools.py +++ b/tests/unit/modules/test_daemontools.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) import os @@ -22,7 +20,6 @@ import salt.modules.daemontools as daemontools from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class DaemontoolsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.daemontools diff --git a/tests/unit/modules/test_data.py b/tests/unit/modules/test_data.py index 6d5307cb87a..2a6e52ae19e 100644 --- a/tests/unit/modules/test_data.py +++ b/tests/unit/modules/test_data.py @@ -7,20 +7,17 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, mock_open, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.data as data -@skipIf(NO_MOCK, NO_MOCK_REASON) class DataTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.data diff --git a/tests/unit/modules/test_ddns.py b/tests/unit/modules/test_ddns.py index 74e6e12067f..191c53cfd58 100644 --- a/tests/unit/modules/test_ddns.py +++ b/tests/unit/modules/test_ddns.py @@ -20,8 +20,6 @@ from tests.support.mock import ( mock_open, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -30,7 +28,6 @@ import salt.modules.ddns as ddns @skipIf(HAS_DNS is False, 'dnspython libs not installed') -@skipIf(NO_MOCK, NO_MOCK_REASON) class DDNSTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for the salt.modules.ddns module diff --git a/tests/unit/modules/test_deb_apache.py b/tests/unit/modules/test_deb_apache.py index ab0fca3c0bc..11a6ac61f82 100644 --- a/tests/unit/modules/test_deb_apache.py +++ b/tests/unit/modules/test_deb_apache.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.deb_apache as deb_apache from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class DebApacheTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.deb_apache diff --git a/tests/unit/modules/test_deb_postgres.py b/tests/unit/modules/test_deb_postgres.py index 6bcd6c27b51..8439b87c5b0 100644 --- a/tests/unit/modules/test_deb_postgres.py +++ b/tests/unit/modules/test_deb_postgres.py @@ -5,8 +5,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock, patch +from tests.support.unit import TestCase +from tests.support.mock import Mock, patch # Import salt libs from salt.ext import six @@ -20,7 +20,6 @@ LSCLUSTER = '''\ ''' -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresClusterTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): @@ -65,7 +64,6 @@ class PostgresClusterTestCase(TestCase, LoaderModuleMockMixin): # datadir='/opt/postgresql')) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresLsClusterTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): @@ -121,7 +119,6 @@ class PostgresLsClusterTestCase(TestCase, LoaderModuleMockMixin): self.assertFalse(deb_postgres.cluster_exists('3.4', 'main')) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresDeleteClusterTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_debconfmod.py b/tests/unit/modules/test_debconfmod.py index d230578718a..c0a89d62597 100644 --- a/tests/unit/modules/test_debconfmod.py +++ b/tests/unit/modules/test_debconfmod.py @@ -7,12 +7,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -20,7 +18,6 @@ import salt.modules.debconfmod as debconfmod import os -@skipIf(NO_MOCK, NO_MOCK_REASON) class DebconfmodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.DebconfmodTestCase diff --git a/tests/unit/modules/test_debian_ip.py b/tests/unit/modules/test_debian_ip.py index e22329343a7..74b4e54b684 100644 --- a/tests/unit/modules/test_debian_ip.py +++ b/tests/unit/modules/test_debian_ip.py @@ -13,8 +13,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -25,7 +23,6 @@ import salt.utils.platform import jinja2.exceptions -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(salt.utils.platform.is_windows(), 'Do not run these tests on Windows') class DebianIpTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_debian_service.py b/tests/unit/modules/test_debian_service.py index bdfa580160f..3ef7a3d35c2 100644 --- a/tests/unit/modules/test_debian_service.py +++ b/tests/unit/modules/test_debian_service.py @@ -7,19 +7,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.debian_service as debian_service -@skipIf(NO_MOCK, NO_MOCK_REASON) class DebianServicesTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.debian_service diff --git a/tests/unit/modules/test_defaults.py b/tests/unit/modules/test_defaults.py index 50707ca592c..6a65435c525 100644 --- a/tests/unit/modules/test_defaults.py +++ b/tests/unit/modules/test_defaults.py @@ -8,19 +8,16 @@ import inspect # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.defaults as defaults -@skipIf(NO_MOCK, NO_MOCK_REASON) class DefaultsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.defaults diff --git a/tests/unit/modules/test_devmap.py b/tests/unit/modules/test_devmap.py index 9b348ec58cc..4a48f00f276 100644 --- a/tests/unit/modules/test_devmap.py +++ b/tests/unit/modules/test_devmap.py @@ -9,19 +9,16 @@ import os.path # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.devmap as devmap -@skipIf(NO_MOCK, NO_MOCK_REASON) class DevMapTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.devmap diff --git a/tests/unit/modules/test_dig.py b/tests/unit/modules/test_dig.py index 10331fcf49d..501862d5a35 100644 --- a/tests/unit/modules/test_dig.py +++ b/tests/unit/modules/test_dig.py @@ -9,7 +9,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import MagicMock, patch # Import salt libs import salt.modules.dig as dig @@ -50,7 +50,6 @@ def _spf_side_effect(key, python_shell=False): 'stdout': ''}) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(dig.__virtual__() is False, 'Dig must be installed') class DigTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/modules/test_djangomod.py b/tests/unit/modules/test_djangomod.py index 52489c96b26..3dccff91078 100644 --- a/tests/unit/modules/test_djangomod.py +++ b/tests/unit/modules/test_djangomod.py @@ -7,19 +7,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.djangomod as djangomod -@skipIf(NO_MOCK, NO_MOCK_REASON) class DjangomodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.djangomod @@ -86,7 +83,6 @@ class DjangomodTestCase(TestCase, LoaderModuleMockMixin): self.assertTrue(djangomod.collectstatic('DJANGO_SETTINGS_MODULE')) -@skipIf(NO_MOCK, NO_MOCK_REASON) class DjangomodCliCommandTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.djangomod diff --git a/tests/unit/modules/test_dnsmasq.py b/tests/unit/modules/test_dnsmasq.py index 55080c68f3b..375d9a39150 100644 --- a/tests/unit/modules/test_dnsmasq.py +++ b/tests/unit/modules/test_dnsmasq.py @@ -9,13 +9,11 @@ import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( mock_open, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -23,7 +21,6 @@ from salt.exceptions import CommandExecutionError import salt.modules.dnsmasq as dnsmasq -@skipIf(NO_MOCK, NO_MOCK_REASON) class DnsmasqTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for the salt.modules.at module diff --git a/tests/unit/modules/test_dnsutil.py b/tests/unit/modules/test_dnsutil.py index 0111c2d2199..7ba6730bc52 100644 --- a/tests/unit/modules/test_dnsutil.py +++ b/tests/unit/modules/test_dnsutil.py @@ -13,8 +13,6 @@ from tests.support.mock import ( MagicMock, patch, mock_open, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -49,27 +47,25 @@ mock_soa_zone = salt.utils.stringutils.to_str( 'NS land-5.com.\n\n' '1 PTR localhost.') -if NO_MOCK is False: - mock_writes_list = salt.utils.data.decode([ - '##\n', - '# Host Database\n', - '#\n', - '# localhost is used to configure the loopback interface\n', - '# when the system is booting. Do not change this entry.\n', - '##\n', - '127.0.0.1 localhost', - '\n', - '255.255.255.255 broadcasthost', - '\n', - '::1 localhost', - '\n', - 'fe80::1%lo0 localhost', - '\n' +mock_writes_list = salt.utils.data.decode([ + '##\n', + '# Host Database\n', + '#\n', + '# localhost is used to configure the loopback interface\n', + '# when the system is booting. Do not change this entry.\n', + '##\n', + '127.0.0.1 localhost', + '\n', + '255.255.255.255 broadcasthost', + '\n', + '::1 localhost', + '\n', + 'fe80::1%lo0 localhost', + '\n' ], to_str=True ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class DNSUtilTestCase(TestCase): def test_parse_hosts(self): with patch('salt.utils.files.fopen', mock_open(read_data=mock_hosts_file)): diff --git a/tests/unit/modules/test_dockermod.py b/tests/unit/modules/test_dockermod.py index a21a8cc501f..13dc9652098 100644 --- a/tests/unit/modules/test_dockermod.py +++ b/tests/unit/modules/test_dockermod.py @@ -12,8 +12,6 @@ from tests.support.unit import skipIf, TestCase from tests.support.mock import ( MagicMock, Mock, - NO_MOCK, - NO_MOCK_REASON, patch, call ) @@ -37,7 +35,6 @@ def _docker_py_version(): return (0,) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(docker_mod.HAS_DOCKER_PY is False, 'docker-py must be installed to run these tests. Skipping.') class DockerTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_dpkg_lowpkg.py b/tests/unit/modules/test_dpkg_lowpkg.py index bdcb7eec894..449aa659afc 100644 --- a/tests/unit/modules/test_dpkg_lowpkg.py +++ b/tests/unit/modules/test_dpkg_lowpkg.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.dpkg_lowpkg as dpkg -@skipIf(NO_MOCK, NO_MOCK_REASON) class DpkgTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.dpkg diff --git a/tests/unit/modules/test_drac.py b/tests/unit/modules/test_drac.py index 650efe7832c..a1858ac57b4 100644 --- a/tests/unit/modules/test_drac.py +++ b/tests/unit/modules/test_drac.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.drac as drac -@skipIf(NO_MOCK, NO_MOCK_REASON) class DracTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.drac diff --git a/tests/unit/modules/test_drbd.py b/tests/unit/modules/test_drbd.py index 8df23540ea0..e81323d4cf8 100644 --- a/tests/unit/modules/test_drbd.py +++ b/tests/unit/modules/test_drbd.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.drbd as drbd -@skipIf(NO_MOCK, NO_MOCK_REASON) class DrbdTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.drbd diff --git a/tests/unit/modules/test_elasticsearch.py b/tests/unit/modules/test_elasticsearch.py index 42da396f8cb..eb2eee5c478 100644 --- a/tests/unit/modules/test_elasticsearch.py +++ b/tests/unit/modules/test_elasticsearch.py @@ -11,8 +11,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -27,7 +25,6 @@ except Exception: NO_ELASTIC = True -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(NO_ELASTIC, 'Install elasticsearch-py before running Elasticsearch unit tests.') class ElasticsearchTestCase(TestCase): ''' diff --git a/tests/unit/modules/test_environ.py b/tests/unit/modules/test_environ.py index be62347cbda..3bfe1c60df1 100644 --- a/tests/unit/modules/test_environ.py +++ b/tests/unit/modules/test_environ.py @@ -8,19 +8,16 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.environ as environ -@skipIf(NO_MOCK, NO_MOCK_REASON) class EnvironTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.environ diff --git a/tests/unit/modules/test_esxcluster.py b/tests/unit/modules/test_esxcluster.py index e478b4a9cbc..39c0117ec91 100644 --- a/tests/unit/modules/test_esxcluster.py +++ b/tests/unit/modules/test_esxcluster.py @@ -13,16 +13,13 @@ import salt.modules.esxcluster as esxcluster # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class GetDetailsTestCase(TestCase, LoaderModuleMockMixin): '''Tests for salt.modules.esxcluster.get_details''' def setup_loader_modules(self): diff --git a/tests/unit/modules/test_esxdatacenter.py b/tests/unit/modules/test_esxdatacenter.py index 3c64653e057..4a5de7bbb2a 100644 --- a/tests/unit/modules/test_esxdatacenter.py +++ b/tests/unit/modules/test_esxdatacenter.py @@ -13,16 +13,13 @@ import salt.modules.esxdatacenter as esxdatacenter # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class GetDetailsTestCase(TestCase, LoaderModuleMockMixin): '''Tests for salt.modules.esxdatacenter.get_details''' def setup_loader_modules(self): diff --git a/tests/unit/modules/test_etcd_mod.py b/tests/unit/modules/test_etcd_mod.py index 2758e923a11..6f1bb139825 100644 --- a/tests/unit/modules/test_etcd_mod.py +++ b/tests/unit/modules/test_etcd_mod.py @@ -8,13 +8,11 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( create_autospec, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -22,7 +20,6 @@ import salt.modules.etcd_mod as etcd_mod import salt.utils.etcd_util as etcd_util -@skipIf(NO_MOCK, NO_MOCK_REASON) class EtcdModTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.etcd_mod diff --git a/tests/unit/modules/test_event.py b/tests/unit/modules/test_event.py index 5e0c6fbf0b7..157c662a74f 100644 --- a/tests/unit/modules/test_event.py +++ b/tests/unit/modules/test_event.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.event as event import salt.utils.event -@skipIf(NO_MOCK, NO_MOCK_REASON) class EventTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.event diff --git a/tests/unit/modules/test_extfs.py b/tests/unit/modules/test_extfs.py index 09d1e88377a..98e2f132c7c 100644 --- a/tests/unit/modules/test_extfs.py +++ b/tests/unit/modules/test_extfs.py @@ -8,14 +8,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.modules.extfs as extfs -@skipIf(NO_MOCK, NO_MOCK_REASON) class ExtfsTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.extfs diff --git a/tests/unit/modules/test_firewalld.py b/tests/unit/modules/test_firewalld.py index 1d61122f474..0a8a9623d97 100644 --- a/tests/unit/modules/test_firewalld.py +++ b/tests/unit/modules/test_firewalld.py @@ -7,19 +7,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.firewalld as firewalld -@skipIf(NO_MOCK, NO_MOCK_REASON) class FirewalldTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.firewalld diff --git a/tests/unit/modules/test_gem.py b/tests/unit/modules/test_gem.py index 4012cc1c406..0d4d8f9e654 100644 --- a/tests/unit/modules/test_gem.py +++ b/tests/unit/modules/test_gem.py @@ -5,14 +5,13 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.modules.gem as gem -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestGemModule(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_genesis.py b/tests/unit/modules/test_genesis.py index 3bf079430f2..305ec097d04 100644 --- a/tests/unit/modules/test_genesis.py +++ b/tests/unit/modules/test_genesis.py @@ -10,19 +10,16 @@ import sys # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.genesis as genesis -@skipIf(NO_MOCK, NO_MOCK_REASON) class GenesisTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.genesis diff --git a/tests/unit/modules/test_gentoo_service.py b/tests/unit/modules/test_gentoo_service.py index d88a02bad52..c986a7482ee 100644 --- a/tests/unit/modules/test_gentoo_service.py +++ b/tests/unit/modules/test_gentoo_service.py @@ -5,12 +5,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, call ) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.modules.gentoo_service as gentoo_service -@skipIf(NO_MOCK, NO_MOCK_REASON) class GentooServicesTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.gentoo_service diff --git a/tests/unit/modules/test_git.py b/tests/unit/modules/test_git.py index a70714df57d..d17df59482e 100644 --- a/tests/unit/modules/test_git.py +++ b/tests/unit/modules/test_git.py @@ -12,13 +12,11 @@ import subprocess # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( Mock, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -72,7 +70,6 @@ def _git_version(): return LooseVersion(git_version.split()[-1]) -@skipIf(NO_MOCK, NO_MOCK_REASON) class GitTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.git diff --git a/tests/unit/modules/test_glusterfs.py b/tests/unit/modules/test_glusterfs.py index 832ce603b53..eed03b4971b 100644 --- a/tests/unit/modules/test_glusterfs.py +++ b/tests/unit/modules/test_glusterfs.py @@ -9,12 +9,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -434,7 +432,6 @@ xml_set_op_version_success = """ """ -@skipIf(NO_MOCK, NO_MOCK_REASON) class GlusterfsTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_gnomedesktop.py b/tests/unit/modules/test_gnomedesktop.py index 70385ad9571..90ee6ec5be3 100644 --- a/tests/unit/modules/test_gnomedesktop.py +++ b/tests/unit/modules/test_gnomedesktop.py @@ -7,18 +7,15 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.gnomedesktop as gnomedesktop -@skipIf(NO_MOCK, NO_MOCK_REASON) class GnomedesktopTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.gnomedesktop diff --git a/tests/unit/modules/test_google_chat.py b/tests/unit/modules/test_google_chat.py index 09b844598e5..a3f88c471d2 100644 --- a/tests/unit/modules/test_google_chat.py +++ b/tests/unit/modules/test_google_chat.py @@ -6,8 +6,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.unit import TestCase +from tests.support.mock import patch # Import Salt Libs import salt.modules.google_chat as gchat @@ -29,7 +29,6 @@ def mocked_http_query_failure(url, method, **kwargs): # pylint: disable=unused- 'dict': None} -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestModulesCfutils(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.google_chat diff --git a/tests/unit/modules/test_gpg.py b/tests/unit/modules/test_gpg.py index dcbcf1b05f0..dddc6e213c1 100644 --- a/tests/unit/modules/test_gpg.py +++ b/tests/unit/modules/test_gpg.py @@ -15,13 +15,8 @@ import time from tests.support.helpers import destructiveTest from tests.support.unit import TestCase, skipIf from tests.support.mixins import LoaderModuleMockMixin -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, - MagicMock, - patch -) from tests.support.runtests import RUNTIME_VARS +from tests.support.mock import MagicMock, patch # Import Salt libs import salt.utils.platform @@ -167,7 +162,6 @@ except ImportError: @destructiveTest -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.utils.platform.is_linux(), 'These tests can only be run on linux') class GpgTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_grains.py b/tests/unit/modules/test_grains.py index 07df4af1c4c..0b6d264147c 100644 --- a/tests/unit/modules/test_grains.py +++ b/tests/unit/modules/test_grains.py @@ -8,12 +8,10 @@ import copy # Import Salt Testing libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt libs @@ -25,7 +23,6 @@ import salt.utils.dictupdate as dictupdate from salt.utils.odict import OrderedDict -@skipIf(NO_MOCK, NO_MOCK_REASON) class GrainsModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_groupadd.py b/tests/unit/modules/test_groupadd.py index 2ce7897a065..a8ee5ebd6e1 100644 --- a/tests/unit/modules/test_groupadd.py +++ b/tests/unit/modules/test_groupadd.py @@ -13,14 +13,13 @@ except ImportError: # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.modules.groupadd as groupadd import salt.utils.platform -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(salt.utils.platform.is_windows(), "Module not available on Windows") class GroupAddTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_grub_legacy.py b/tests/unit/modules/test_grub_legacy.py index ed4cfc42558..26365ee241b 100644 --- a/tests/unit/modules/test_grub_legacy.py +++ b/tests/unit/modules/test_grub_legacy.py @@ -9,13 +9,11 @@ import errno # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( mock_open, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -24,7 +22,6 @@ import salt.utils.stringutils from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class GrublegacyTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.grub_legacy diff --git a/tests/unit/modules/test_guestfs.py b/tests/unit/modules/test_guestfs.py index 064b9e6cc37..c568e6d6f45 100644 --- a/tests/unit/modules/test_guestfs.py +++ b/tests/unit/modules/test_guestfs.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.guestfs as guestfs -@skipIf(NO_MOCK, NO_MOCK_REASON) class GuestfsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.guestfs diff --git a/tests/unit/modules/test_hadoop.py b/tests/unit/modules/test_hadoop.py index 423a85ceeca..9f693d93614 100644 --- a/tests/unit/modules/test_hadoop.py +++ b/tests/unit/modules/test_hadoop.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.hadoop as hadoop -@skipIf(NO_MOCK, NO_MOCK_REASON) class HadoopTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.hadoop diff --git a/tests/unit/modules/test_haproxyconn.py b/tests/unit/modules/test_haproxyconn.py index 92fe1b1cd9a..678fc5f971b 100644 --- a/tests/unit/modules/test_haproxyconn.py +++ b/tests/unit/modules/test_haproxyconn.py @@ -8,8 +8,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase # Import Salt Libs import salt.modules.haproxyconn as haproxyconn @@ -100,7 +99,6 @@ class MockHaConn(object): return ha_cmd -@skipIf(NO_MOCK, NO_MOCK_REASON) class HaproxyConnTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.haproxyconn diff --git a/tests/unit/modules/test_hg.py b/tests/unit/modules/test_hg.py index 6843f4d3061..d62090daaa8 100644 --- a/tests/unit/modules/test_hg.py +++ b/tests/unit/modules/test_hg.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.hg as hg -@skipIf(NO_MOCK, NO_MOCK_REASON) class HgTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.hg diff --git a/tests/unit/modules/test_http.py b/tests/unit/modules/test_http.py index 088382dd420..f4c66b8a394 100644 --- a/tests/unit/modules/test_http.py +++ b/tests/unit/modules/test_http.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -20,7 +18,6 @@ import salt.modules.http as http import salt.utils.http -@skipIf(NO_MOCK, NO_MOCK_REASON) class HttpTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.http diff --git a/tests/unit/modules/test_ilo.py b/tests/unit/modules/test_ilo.py index dd8e5e9c47c..7e28815b6f7 100644 --- a/tests/unit/modules/test_ilo.py +++ b/tests/unit/modules/test_ilo.py @@ -11,12 +11,10 @@ import tempfile # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -26,7 +24,6 @@ import salt.modules.file log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class IloTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.ilo diff --git a/tests/unit/modules/test_incron.py b/tests/unit/modules/test_incron.py index 09890c6c025..76aa4aa463c 100644 --- a/tests/unit/modules/test_incron.py +++ b/tests/unit/modules/test_incron.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.incron as incron -@skipIf(NO_MOCK, NO_MOCK_REASON) class IncronTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.incron diff --git a/tests/unit/modules/test_influxdb08mod.py b/tests/unit/modules/test_influxdb08mod.py index 359a1fdaf85..39aae8758f3 100644 --- a/tests/unit/modules/test_influxdb08mod.py +++ b/tests/unit/modules/test_influxdb08mod.py @@ -7,12 +7,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -57,7 +55,6 @@ class MockInfluxDBClient(object): return query, time_precision, chunked -@skipIf(NO_MOCK, NO_MOCK_REASON) class InfluxTestCase(TestCase): ''' TestCase for the salt.modules.at module diff --git a/tests/unit/modules/test_introspect.py b/tests/unit/modules/test_introspect.py index 30df0bd9ada..1c79f6a0ac4 100644 --- a/tests/unit/modules/test_introspect.py +++ b/tests/unit/modules/test_introspect.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.introspect as introspect -@skipIf(NO_MOCK, NO_MOCK_REASON) class IntrospectTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.introspect diff --git a/tests/unit/modules/test_iosconfig.py b/tests/unit/modules/test_iosconfig.py index 879d531be5a..90b528e5e09 100644 --- a/tests/unit/modules/test_iosconfig.py +++ b/tests/unit/modules/test_iosconfig.py @@ -9,15 +9,13 @@ import textwrap # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase # Import Salt modules from salt.utils.odict import OrderedDict import salt.modules.iosconfig as iosconfig -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestModulesIOSConfig(TestCase, LoaderModuleMockMixin): running_config = textwrap.dedent('''\ diff --git a/tests/unit/modules/test_ipset.py b/tests/unit/modules/test_ipset.py index b20bae2ef90..d43cbc98c6a 100644 --- a/tests/unit/modules/test_ipset.py +++ b/tests/unit/modules/test_ipset.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.ipset as ipset -@skipIf(NO_MOCK, NO_MOCK_REASON) class IpsetTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.aptpkg diff --git a/tests/unit/modules/test_iptables.py b/tests/unit/modules/test_iptables.py index 81022190258..870bfb92912 100644 --- a/tests/unit/modules/test_iptables.py +++ b/tests/unit/modules/test_iptables.py @@ -9,19 +9,16 @@ import uuid # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.iptables as iptables -@skipIf(NO_MOCK, NO_MOCK_REASON) class IptablesTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.iptables diff --git a/tests/unit/modules/test_jboss7.py b/tests/unit/modules/test_jboss7.py index 87383a0d54a..8e794359933 100644 --- a/tests/unit/modules/test_jboss7.py +++ b/tests/unit/modules/test_jboss7.py @@ -5,15 +5,14 @@ from __future__ import absolute_import, print_function, unicode_literals # Import salt testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import MagicMock # Import salt libs from salt.utils.odict import OrderedDict import salt.modules.jboss7 as jboss7 -@skipIf(NO_MOCK, NO_MOCK_REASON) class JBoss7TestCase(TestCase, LoaderModuleMockMixin): jboss_config = {} diff --git a/tests/unit/modules/test_kernelpkg_linux_apt.py b/tests/unit/modules/test_kernelpkg_linux_apt.py index 2a1cc0c364a..6eb5e154088 100644 --- a/tests/unit/modules/test_kernelpkg_linux_apt.py +++ b/tests/unit/modules/test_kernelpkg_linux_apt.py @@ -15,7 +15,7 @@ try: # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf - from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON + from tests.support.mock import MagicMock, patch # Import Salt Libs from tests.support.kernelpkg import KernelPkgTestCase @@ -26,7 +26,6 @@ except ImportError: HAS_MODULES = False -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_MODULES, 'Salt modules could not be loaded') class AptKernelPkgTestCase(KernelPkgTestCase, TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_kernelpkg_linux_yum.py b/tests/unit/modules/test_kernelpkg_linux_yum.py index 68bc0b6a970..5d55fafd479 100644 --- a/tests/unit/modules/test_kernelpkg_linux_yum.py +++ b/tests/unit/modules/test_kernelpkg_linux_yum.py @@ -14,7 +14,7 @@ try: # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf - from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON + from tests.support.mock import MagicMock, patch # Import Salt Libs from tests.support.kernelpkg import KernelPkgTestCase @@ -26,7 +26,6 @@ except ImportError: HAS_MODULES = False -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_MODULES, 'Salt modules could not be loaded') class YumKernelPkgTestCase(KernelPkgTestCase, TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_key.py b/tests/unit/modules/test_key.py index 3f718ee5ce4..30a18b0c3b5 100644 --- a/tests/unit/modules/test_key.py +++ b/tests/unit/modules/test_key.py @@ -9,12 +9,10 @@ import os.path # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -22,7 +20,6 @@ import salt.utils.crypt import salt.modules.key as key -@skipIf(NO_MOCK, NO_MOCK_REASON) class KeyTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.key diff --git a/tests/unit/modules/test_keyboard.py b/tests/unit/modules/test_keyboard.py index 682ba3eed8b..5182549cf09 100644 --- a/tests/unit/modules/test_keyboard.py +++ b/tests/unit/modules/test_keyboard.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.keyboard as keyboard -@skipIf(NO_MOCK, NO_MOCK_REASON) class KeyboardTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.keyboard diff --git a/tests/unit/modules/test_keystone.py b/tests/unit/modules/test_keystone.py index dcf91b96f53..ce72ee171ba 100644 --- a/tests/unit/modules/test_keystone.py +++ b/tests/unit/modules/test_keystone.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -422,7 +420,6 @@ class MockClient(object): return True -@skipIf(NO_MOCK, NO_MOCK_REASON) class KeystoneTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.keystone diff --git a/tests/unit/modules/test_kubernetesmod.py b/tests/unit/modules/test_kubernetesmod.py index bd2ae6efa0a..f3dcbfcd069 100644 --- a/tests/unit/modules/test_kubernetesmod.py +++ b/tests/unit/modules/test_kubernetesmod.py @@ -16,8 +16,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( Mock, patch, - NO_MOCK, - NO_MOCK_REASON ) import salt.utils.files @@ -36,7 +34,6 @@ def mock_kubernetes_library(): yield mock_kubernetes_lib -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not kubernetes.HAS_LIBS, "Kubernetes client lib is not installed. " "Skipping test_kubernetes.py") class KubernetesTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/modules/test_launchctl_service.py b/tests/unit/modules/test_launchctl_service.py index c4ade65748d..306f48b29be 100644 --- a/tests/unit/modules/test_launchctl_service.py +++ b/tests/unit/modules/test_launchctl_service.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -22,7 +20,6 @@ import salt.utils.stringutils import salt.modules.launchctl_service as launchctl -@skipIf(NO_MOCK, NO_MOCK_REASON) class LaunchctlTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.launchctl diff --git a/tests/unit/modules/test_ldapmod.py b/tests/unit/modules/test_ldapmod.py index 16652345df0..e9c83dca93d 100644 --- a/tests/unit/modules/test_ldapmod.py +++ b/tests/unit/modules/test_ldapmod.py @@ -9,19 +9,16 @@ import time # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.ldapmod as ldapmod -@skipIf(NO_MOCK, NO_MOCK_REASON) class LdapmodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.ldapmod diff --git a/tests/unit/modules/test_libcloud_compute.py b/tests/unit/modules/test_libcloud_compute.py index ce377cea6ad..ee9e0a53523 100644 --- a/tests/unit/modules/test_libcloud_compute.py +++ b/tests/unit/modules/test_libcloud_compute.py @@ -15,8 +15,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import salt.modules.libcloud_compute as libcloud_compute @@ -199,7 +197,6 @@ else: MockComputeDriver = object -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_LIBCLOUD, 'No libcloud installed') @patch('salt.modules.libcloud_compute._get_driver', MagicMock(return_value=MockComputeDriver())) diff --git a/tests/unit/modules/test_libcloud_dns.py b/tests/unit/modules/test_libcloud_dns.py index c6b5b418085..e0158f57dd6 100644 --- a/tests/unit/modules/test_libcloud_dns.py +++ b/tests/unit/modules/test_libcloud_dns.py @@ -12,8 +12,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import salt.modules.libcloud_dns as libcloud_dns @@ -27,7 +25,6 @@ def get_mock_driver(): return MockDNSDriver() -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not libcloud_dns.HAS_LIBCLOUD, 'No libcloud installed') class LibcloudDnsModuleTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/modules/test_libcloud_loadbalancer.py b/tests/unit/modules/test_libcloud_loadbalancer.py index 9a7da90be50..6b8b6e72ceb 100644 --- a/tests/unit/modules/test_libcloud_loadbalancer.py +++ b/tests/unit/modules/test_libcloud_loadbalancer.py @@ -12,8 +12,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import salt.modules.libcloud_loadbalancer as libcloud_loadbalancer @@ -87,8 +85,7 @@ def get_mock_driver(): return MockLBDriver() -@skipIf(not HAS_LIBCLOUD, NO_MOCK_REASON) -@skipIf(NO_MOCK, NO_MOCK_REASON) +@skipIf(not HAS_LIBCLOUD, 'No libcloud package') @patch('salt.modules.libcloud_loadbalancer._get_driver', MagicMock(return_value=MockLBDriver())) class LibcloudLoadBalancerModuleTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/modules/test_libcloud_storage.py b/tests/unit/modules/test_libcloud_storage.py index a72690bdd75..8c4786e5b8b 100644 --- a/tests/unit/modules/test_libcloud_storage.py +++ b/tests/unit/modules/test_libcloud_storage.py @@ -12,8 +12,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import salt.modules.libcloud_storage as libcloud_storage @@ -63,7 +61,6 @@ def get_mock_driver(): return MockStorageDriver() -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_LIBCLOUD, 'No libcloud installed') @patch('salt.modules.libcloud_storage._get_driver', MagicMock(return_value=MockStorageDriver())) diff --git a/tests/unit/modules/test_linux_acl.py b/tests/unit/modules/test_linux_acl.py index 4dc544f493b..ec594d71827 100644 --- a/tests/unit/modules/test_linux_acl.py +++ b/tests/unit/modules/test_linux_acl.py @@ -5,15 +5,14 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.modules.linux_acl as linux_acl from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class LinuxAclTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_linux_lvm.py b/tests/unit/modules/test_linux_lvm.py index a8ff3c3a267..77ebf63720f 100644 --- a/tests/unit/modules/test_linux_lvm.py +++ b/tests/unit/modules/test_linux_lvm.py @@ -9,12 +9,10 @@ import os.path # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -22,7 +20,6 @@ import salt.modules.linux_lvm as linux_lvm from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class LinuxLVMTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for the salt.modules.linux_lvm module diff --git a/tests/unit/modules/test_linux_sysctl.py b/tests/unit/modules/test_linux_sysctl.py index 0f6cb442c6d..49cfb0a22fe 100644 --- a/tests/unit/modules/test_linux_sysctl.py +++ b/tests/unit/modules/test_linux_sysctl.py @@ -13,17 +13,14 @@ from salt.exceptions import CommandExecutionError # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, mock_open, patch, - NO_MOCK, - NO_MOCK_REASON ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class LinuxSysctlTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.linux_sysctl module diff --git a/tests/unit/modules/test_localemod.py b/tests/unit/modules/test_localemod.py index eec8bf1b041..af77394bafe 100644 --- a/tests/unit/modules/test_localemod.py +++ b/tests/unit/modules/test_localemod.py @@ -13,8 +13,6 @@ from tests.support.mock import ( MagicMock, Mock, patch, - NO_MOCK, - NO_MOCK_REASON ) try: import pytest @@ -28,7 +26,6 @@ from salt.ext import six @skipIf(not pytest, False) -@skipIf(NO_MOCK, NO_MOCK_REASON) class LocalemodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.localemod diff --git a/tests/unit/modules/test_locate.py b/tests/unit/modules/test_locate.py index d595c22e758..a7c6e48882f 100644 --- a/tests/unit/modules/test_locate.py +++ b/tests/unit/modules/test_locate.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.locate as locate -@skipIf(NO_MOCK, NO_MOCK_REASON) class LocateTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.locate diff --git a/tests/unit/modules/test_logadm.py b/tests/unit/modules/test_logadm.py index c51564cd99f..0329ddcd77f 100644 --- a/tests/unit/modules/test_logadm.py +++ b/tests/unit/modules/test_logadm.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.logadm as logadm -@skipIf(NO_MOCK, NO_MOCK_REASON) class LogadmTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.logadm diff --git a/tests/unit/modules/test_logrotate.py b/tests/unit/modules/test_logrotate.py index 4ecb57039cb..c38b4ca7634 100644 --- a/tests/unit/modules/test_logrotate.py +++ b/tests/unit/modules/test_logrotate.py @@ -12,12 +12,10 @@ import salt.modules.logrotate as logrotate # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) PARSE_CONF = { @@ -31,7 +29,6 @@ PARSE_CONF = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class LogrotateTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.logrotate diff --git a/tests/unit/modules/test_lvs.py b/tests/unit/modules/test_lvs.py index 24d8552787a..7c14b5cea4f 100644 --- a/tests/unit/modules/test_lvs.py +++ b/tests/unit/modules/test_lvs.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.lvs as lvs -@skipIf(NO_MOCK, NO_MOCK_REASON) class LvsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.lvs diff --git a/tests/unit/modules/test_mac_brew_pkg.py b/tests/unit/modules/test_mac_brew_pkg.py index b26395b91ff..2562467b6ba 100644 --- a/tests/unit/modules/test_mac_brew_pkg.py +++ b/tests/unit/modules/test_mac_brew_pkg.py @@ -13,15 +13,14 @@ import salt.utils.pkg # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import MagicMock, Mock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, Mock, patch TAPS_STRING = 'homebrew/dupes\nhomebrew/science\nhomebrew/x11' TAPS_LIST = ['homebrew/dupes', 'homebrew/science', 'homebrew/x11'] HOMEBREW_BIN = '/usr/local/bin/brew' -@skipIf(NO_MOCK, NO_MOCK_REASON) class BrewTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.mac_brew module diff --git a/tests/unit/modules/test_mac_desktop.py b/tests/unit/modules/test_mac_desktop.py index 8dbafab6f1b..3b1c71ffc78 100644 --- a/tests/unit/modules/test_mac_desktop.py +++ b/tests/unit/modules/test_mac_desktop.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.mac_desktop as mac_desktop from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class MacDesktopTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.mac_desktop diff --git a/tests/unit/modules/test_mac_pkgutil.py b/tests/unit/modules/test_mac_pkgutil.py index de284e37152..29b5926b610 100644 --- a/tests/unit/modules/test_mac_pkgutil.py +++ b/tests/unit/modules/test_mac_pkgutil.py @@ -8,11 +8,10 @@ import salt.modules.mac_pkgutil as mac_pkgutil # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.unit import TestCase +from tests.support.mock import patch -@skipIf(NO_MOCK, NO_MOCK_REASON) class MacPkgutilTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_mac_power.py b/tests/unit/modules/test_mac_power.py index f4f74dd27ed..3c2d990de31 100644 --- a/tests/unit/modules/test_mac_power.py +++ b/tests/unit/modules/test_mac_power.py @@ -7,15 +7,13 @@ mac_power tests from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase # Import Salt Libs import salt.modules.mac_power as mac_power from salt.exceptions import SaltInvocationError -@skipIf(NO_MOCK, NO_MOCK_REASON) class MacPowerTestCase(TestCase): ''' test mac_power execution module diff --git a/tests/unit/modules/test_mac_service.py b/tests/unit/modules/test_mac_service.py index 87bc50d5ada..04392c42777 100644 --- a/tests/unit/modules/test_mac_service.py +++ b/tests/unit/modules/test_mac_service.py @@ -11,16 +11,13 @@ import salt.modules.mac_service as mac_service # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class MacServiceTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.mac_service module diff --git a/tests/unit/modules/test_mac_sysctl.py b/tests/unit/modules/test_mac_sysctl.py index c1e889b5a64..35cc00f1b82 100644 --- a/tests/unit/modules/test_mac_sysctl.py +++ b/tests/unit/modules/test_mac_sysctl.py @@ -12,18 +12,15 @@ from salt.exceptions import CommandExecutionError # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, mock_open, patch, - NO_MOCK, - NO_MOCK_REASON, DEFAULT ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class DarwinSysctlTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.mac_sysctl module diff --git a/tests/unit/modules/test_mac_user.py b/tests/unit/modules/test_mac_user.py index a86c16678b4..a3ebf3832f4 100644 --- a/tests/unit/modules/test_mac_user.py +++ b/tests/unit/modules/test_mac_user.py @@ -13,7 +13,7 @@ except ImportError: # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.modules.mac_user as mac_user @@ -21,7 +21,6 @@ from salt.exceptions import SaltInvocationError, CommandExecutionError @skipIf(not HAS_PWD, "Missing required library 'pwd'") -@skipIf(NO_MOCK, NO_MOCK_REASON) class MacUserTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for the salt.modules.mac_user modules diff --git a/tests/unit/modules/test_mandrill.py b/tests/unit/modules/test_mandrill.py index e1ac0de353c..368d2b8e068 100644 --- a/tests/unit/modules/test_mandrill.py +++ b/tests/unit/modules/test_mandrill.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -34,7 +32,6 @@ TEST_SEND = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class MandrillModuleTest(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.mandrill. diff --git a/tests/unit/modules/test_match.py b/tests/unit/modules/test_match.py index fc113996663..3e62f4828a4 100644 --- a/tests/unit/modules/test_match.py +++ b/tests/unit/modules/test_match.py @@ -9,12 +9,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, ) # Import Salt Libs @@ -34,7 +32,6 @@ MATCHERS_DICT = { MINION_ID = 'bar03' -@skipIf(NO_MOCK, NO_MOCK_REASON) @patch('salt.loader.matchers', MagicMock(return_value=MATCHERS_DICT)) class MatchTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_mdadm_raid.py b/tests/unit/modules/test_mdadm_raid.py index c9b09ed94eb..16d36f96e1f 100644 --- a/tests/unit/modules/test_mdadm_raid.py +++ b/tests/unit/modules/test_mdadm_raid.py @@ -12,14 +12,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.modules.mdadm_raid as mdadm -@skipIf(NO_MOCK, NO_MOCK_REASON) class MdadmTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_memcached.py b/tests/unit/modules/test_memcached.py index 9156645cb66..3c0d84fb08e 100644 --- a/tests/unit/modules/test_memcached.py +++ b/tests/unit/modules/test_memcached.py @@ -7,12 +7,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ from salt.exceptions import CommandExecutionError, SaltInvocationError from salt.ext.six import integer_types -@skipIf(NO_MOCK, NO_MOCK_REASON) class MemcachedTestCase(TestCase): ''' Test cases for salt.modules.memcached diff --git a/tests/unit/modules/test_mine.py b/tests/unit/modules/test_mine.py index 9e5faf50bcf..fcd39189b08 100644 --- a/tests/unit/modules/test_mine.py +++ b/tests/unit/modules/test_mine.py @@ -8,18 +8,15 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.mine as mine -@skipIf(NO_MOCK, NO_MOCK_REASON) class MineTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.mine diff --git a/tests/unit/modules/test_mod_random.py b/tests/unit/modules/test_mod_random.py index 88be09a766b..b1fbec69ff9 100644 --- a/tests/unit/modules/test_mod_random.py +++ b/tests/unit/modules/test_mod_random.py @@ -11,8 +11,6 @@ from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -45,7 +43,6 @@ SUPPORTED_HASHLIB = _test_hashlib() @skipIf(not SUPPORTED_HASHLIB, 'Hashlib does not contain needed functionality') -@skipIf(NO_MOCK, NO_MOCK_REASON) class ModrandomTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.mod_random diff --git a/tests/unit/modules/test_modjk.py b/tests/unit/modules/test_modjk.py index f71ed54fb01..e23d91fd35d 100644 --- a/tests/unit/modules/test_modjk.py +++ b/tests/unit/modules/test_modjk.py @@ -7,18 +7,15 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.modjk as modjk -@skipIf(NO_MOCK, NO_MOCK_REASON) class ModjkTestCase(TestCase): ''' Test cases for salt.modules.modjk diff --git a/tests/unit/modules/test_monit.py b/tests/unit/modules/test_monit.py index a27b8d40e79..9eb3f5a2005 100644 --- a/tests/unit/modules/test_monit.py +++ b/tests/unit/modules/test_monit.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.monit as monit -@skipIf(NO_MOCK, NO_MOCK_REASON) class MonitTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.aptpkg diff --git a/tests/unit/modules/test_moosefs.py b/tests/unit/modules/test_moosefs.py index 537f254ed44..2fbb1b0bcbe 100644 --- a/tests/unit/modules/test_moosefs.py +++ b/tests/unit/modules/test_moosefs.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.moosefs as moosefs -@skipIf(NO_MOCK, NO_MOCK_REASON) class MoosefsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.moosefs diff --git a/tests/unit/modules/test_mount.py b/tests/unit/modules/test_mount.py index 808cef90df4..628c5c26c79 100644 --- a/tests/unit/modules/test_mount.py +++ b/tests/unit/modules/test_mount.py @@ -9,13 +9,11 @@ import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( mock_open, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -27,7 +25,6 @@ from salt.exceptions import CommandExecutionError MOCK_SHELL_FILE = 'A B C D F G\n' -@skipIf(NO_MOCK, NO_MOCK_REASON) class MountTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.mount diff --git a/tests/unit/modules/test_munin.py b/tests/unit/modules/test_munin.py index e1bc601c206..eba929efd8e 100644 --- a/tests/unit/modules/test_munin.py +++ b/tests/unit/modules/test_munin.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.munin as munin -@skipIf(NO_MOCK, NO_MOCK_REASON) class MuninTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.munin diff --git a/tests/unit/modules/test_mysql.py b/tests/unit/modules/test_mysql.py index e552c5dbfa5..4e8cd46aa0d 100644 --- a/tests/unit/modules/test_mysql.py +++ b/tests/unit/modules/test_mysql.py @@ -13,7 +13,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch, call +from tests.support.mock import MagicMock, patch, call # Import salt libs import salt.modules.mysql as mysql @@ -71,7 +71,6 @@ __all_privileges__ = [ ] -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(NO_MYSQL, 'Install MySQL bindings before running MySQL unit tests.') class MySQLTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/modules/test_nagios.py b/tests/unit/modules/test_nagios.py index 0ebb5026f6a..ca2d9b4ce4b 100644 --- a/tests/unit/modules/test_nagios.py +++ b/tests/unit/modules/test_nagios.py @@ -8,19 +8,16 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.nagios as nagios -@skipIf(NO_MOCK, NO_MOCK_REASON) class NagiosTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.nagios diff --git a/tests/unit/modules/test_napalm_bgp.py b/tests/unit/modules/test_napalm_bgp.py index cc5afdf45f7..8d92b0afc27 100644 --- a/tests/unit/modules/test_napalm_bgp.py +++ b/tests/unit/modules/test_napalm_bgp.py @@ -8,18 +8,15 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import tests.support.napalm as napalm_test_support import salt.modules.napalm_bgp as napalm_bgp # NOQA -@skipIf(NO_MOCK, NO_MOCK_REASON) class NapalmBgpModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_napalm_formula.py b/tests/unit/modules/test_napalm_formula.py index bcd91b93f29..e1799a4f0a5 100644 --- a/tests/unit/modules/test_napalm_formula.py +++ b/tests/unit/modules/test_napalm_formula.py @@ -9,14 +9,13 @@ import textwrap # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.unit import TestCase +from tests.support.mock import patch # Import Salt modules import salt.modules.napalm_formula as napalm_formula -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestModulesNAPALMFormula(TestCase, LoaderModuleMockMixin): model = { diff --git a/tests/unit/modules/test_napalm_netacl.py b/tests/unit/modules/test_napalm_netacl.py index 1ccff9a58b7..c73048d1326 100644 --- a/tests/unit/modules/test_napalm_netacl.py +++ b/tests/unit/modules/test_napalm_netacl.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import tests.support.napalm as napalm_test_support @@ -53,7 +51,6 @@ def mock_capirca_get_term_pillar(filter_, term, *args, **kwargs): return {'test': 'value'} -@skipIf(NO_MOCK, NO_MOCK_REASON) class NapalmAclModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_napalm_network.py b/tests/unit/modules/test_napalm_network.py index 5fc0e362c84..cf7ea26f239 100644 --- a/tests/unit/modules/test_napalm_network.py +++ b/tests/unit/modules/test_napalm_network.py @@ -8,18 +8,15 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import tests.support.napalm as napalm_test_support import salt.modules.napalm_network as napalm_network # NOQA -@skipIf(NO_MOCK, NO_MOCK_REASON) class NapalmNetworkModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_napalm_ntp.py b/tests/unit/modules/test_napalm_ntp.py index e94aec291cd..62140a4810e 100644 --- a/tests/unit/modules/test_napalm_ntp.py +++ b/tests/unit/modules/test_napalm_ntp.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import tests.support.napalm as napalm_test_support @@ -26,7 +24,6 @@ def mock_net_load_template(template, *args, **kwargs): assert '2.2.3.4' in kwargs['servers'] -@skipIf(NO_MOCK, NO_MOCK_REASON) class NapalmNtpModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_napalm_probes.py b/tests/unit/modules/test_napalm_probes.py index e4855ad2942..3b8aacb959a 100644 --- a/tests/unit/modules/test_napalm_probes.py +++ b/tests/unit/modules/test_napalm_probes.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import tests.support.napalm as napalm_test_support @@ -61,7 +59,6 @@ def mock_net_load(template, *args, **kwargs): raise ValueError("incorrect template {0}".format(template)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class NapalmProbesModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_napalm_route.py b/tests/unit/modules/test_napalm_route.py index 54b192260fc..c459ac818f9 100644 --- a/tests/unit/modules/test_napalm_route.py +++ b/tests/unit/modules/test_napalm_route.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import tests.support.napalm as napalm_test_support @@ -23,7 +21,6 @@ def mock_net_load(template, *args, **kwargs): raise ValueError("incorrect template {0}".format(template)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class NapalmRouteModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_napalm_snmp.py b/tests/unit/modules/test_napalm_snmp.py index dcb5bb1e37e..d5f82f38a92 100644 --- a/tests/unit/modules/test_napalm_snmp.py +++ b/tests/unit/modules/test_napalm_snmp.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import tests.support.napalm as napalm_test_support @@ -20,7 +18,6 @@ import salt.modules.napalm_snmp as napalm_snmp # NOQA import salt.modules.napalm_network as napalm_network # NOQA -@skipIf(NO_MOCK, NO_MOCK_REASON) class NapalmSnmpModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_napalm_users.py b/tests/unit/modules/test_napalm_users.py index 37f68c8b721..f8214ea7609 100644 --- a/tests/unit/modules/test_napalm_users.py +++ b/tests/unit/modules/test_napalm_users.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import tests.support.napalm as napalm_test_support @@ -20,7 +18,6 @@ import salt.modules.napalm_users as napalm_users # NOQA import salt.modules.napalm_network as napalm_network # NOQA -@skipIf(NO_MOCK, NO_MOCK_REASON) class NapalmUsersModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_napalm_yang_mod.py b/tests/unit/modules/test_napalm_yang_mod.py index e2af6882d87..2be6d203bd6 100644 --- a/tests/unit/modules/test_napalm_yang_mod.py +++ b/tests/unit/modules/test_napalm_yang_mod.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import tests.support.napalm as napalm_test_support @@ -57,7 +55,6 @@ def mock_net_load_config(**kwargs): return TEST_CONFIG -@skipIf(NO_MOCK, NO_MOCK_REASON) class NapalmYangModModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_netbox.py b/tests/unit/modules/test_netbox.py index d408b74e086..d6c005f6399 100644 --- a/tests/unit/modules/test_netbox.py +++ b/tests/unit/modules/test_netbox.py @@ -19,8 +19,6 @@ from tests.support.mock import ( patch, MagicMock, call, - NO_MOCK, - NO_MOCK_REASON ) import salt.modules.netbox as netbox @@ -49,7 +47,6 @@ def mocked_clean_kwargs_get(**kwargs): @skipIf(HAS_PYNETBOX is False, 'pynetbox lib not installed') -@skipIf(NO_MOCK, NO_MOCK_REASON) @patch('salt.modules.netbox._config', MagicMock()) class NetBoxTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/modules/test_netscaler.py b/tests/unit/modules/test_netscaler.py index ad79c3797e8..1c026d64719 100644 --- a/tests/unit/modules/test_netscaler.py +++ b/tests/unit/modules/test_netscaler.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -555,7 +553,6 @@ class MockNSSSLVServerSSLCertKeyBinding(object): return MockNSSSLVServerSSLCertKeyBinding() -@skipIf(NO_MOCK, NO_MOCK_REASON) class NetscalerTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.netscaler diff --git a/tests/unit/modules/test_network.py b/tests/unit/modules/test_network.py index 0f9c28d9c64..7b36f965f5b 100644 --- a/tests/unit/modules/test_network.py +++ b/tests/unit/modules/test_network.py @@ -16,8 +16,6 @@ from tests.support.mock import ( mock_open, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -30,7 +28,6 @@ from salt._compat import ipaddress log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class NetworkTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.network diff --git a/tests/unit/modules/test_neutron.py b/tests/unit/modules/test_neutron.py index 8e303cf187b..423b6f26aa8 100644 --- a/tests/unit/modules/test_neutron.py +++ b/tests/unit/modules/test_neutron.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -471,7 +469,6 @@ class MockNeutron(object): return ipsecpolicy -@skipIf(NO_MOCK, NO_MOCK_REASON) class NeutronTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.neutron diff --git a/tests/unit/modules/test_nexus.py b/tests/unit/modules/test_nexus.py index 9fa28c39760..3315b0867e4 100644 --- a/tests/unit/modules/test_nexus.py +++ b/tests/unit/modules/test_nexus.py @@ -5,14 +5,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt libs import salt.modules.nexus as nexus -@skipIf(NO_MOCK, NO_MOCK_REASON) class nexusTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_nfs3.py b/tests/unit/modules/test_nfs3.py index 6fa010d8ee2..557dbac5dac 100644 --- a/tests/unit/modules/test_nfs3.py +++ b/tests/unit/modules/test_nfs3.py @@ -8,20 +8,17 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, mock_open, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.nfs3 as nfs3 -@skipIf(NO_MOCK, NO_MOCK_REASON) class NfsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.nfs3 diff --git a/tests/unit/modules/test_nftables.py b/tests/unit/modules/test_nftables.py index 0746b5b638a..f755c41339d 100644 --- a/tests/unit/modules/test_nftables.py +++ b/tests/unit/modules/test_nftables.py @@ -8,13 +8,11 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, mock_open, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -23,7 +21,6 @@ import salt.utils.files from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class NftablesTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.nftables diff --git a/tests/unit/modules/test_nginx.py b/tests/unit/modules/test_nginx.py index c75906197c3..c634d2aa49a 100644 --- a/tests/unit/modules/test_nginx.py +++ b/tests/unit/modules/test_nginx.py @@ -5,8 +5,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock, patch +from tests.support.unit import TestCase +from tests.support.mock import Mock, patch # Import Salt Module import salt.modules.nginx as nginx @@ -26,7 +26,6 @@ class MockUrllibStatus(object): pass -@skipIf(NO_MOCK, NO_MOCK_REASON) class NginxTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_nova.py b/tests/unit/modules/test_nova.py index 56197ddba26..4e3cc9e02e9 100644 --- a/tests/unit/modules/test_nova.py +++ b/tests/unit/modules/test_nova.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.nova as nova -@skipIf(NO_MOCK, NO_MOCK_REASON) class NovaTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.nova diff --git a/tests/unit/modules/test_npm.py b/tests/unit/modules/test_npm.py index 4bd42791f0b..a2c87d76563 100644 --- a/tests/unit/modules/test_npm.py +++ b/tests/unit/modules/test_npm.py @@ -9,12 +9,10 @@ import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -23,7 +21,6 @@ import salt.modules.npm as npm from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class NpmTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.npm diff --git a/tests/unit/modules/test_openbsd_sysctl.py b/tests/unit/modules/test_openbsd_sysctl.py index 248adaf7673..2a92e067952 100644 --- a/tests/unit/modules/test_openbsd_sysctl.py +++ b/tests/unit/modules/test_openbsd_sysctl.py @@ -12,16 +12,13 @@ from salt.exceptions import CommandExecutionError # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class OpenBSDSysctlTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.openbsd_sysctl module diff --git a/tests/unit/modules/test_openbsdpkg.py b/tests/unit/modules/test_openbsdpkg.py index fe607b7db4b..f5666745696 100644 --- a/tests/unit/modules/test_openbsdpkg.py +++ b/tests/unit/modules/test_openbsdpkg.py @@ -8,13 +8,11 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, call, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -35,7 +33,6 @@ class ListPackages(object): return pkgs -@skipIf(NO_MOCK, NO_MOCK_REASON) class OpenbsdpkgTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.openbsdpkg diff --git a/tests/unit/modules/test_openscap.py b/tests/unit/modules/test_openscap.py index 6e17148de19..516b639ed2f 100644 --- a/tests/unit/modules/test_openscap.py +++ b/tests/unit/modules/test_openscap.py @@ -8,20 +8,17 @@ from subprocess import PIPE import salt.modules.openscap as openscap # Import salt test libs -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( Mock, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import 3rd-party libs from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class OpenscapTestCase(TestCase): random_temp_dir = '/tmp/unique-name' diff --git a/tests/unit/modules/test_openstack_config.py b/tests/unit/modules/test_openstack_config.py index 0e1c2e6c43c..6f40412233a 100644 --- a/tests/unit/modules/test_openstack_config.py +++ b/tests/unit/modules/test_openstack_config.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.openstack_config as openstack_config from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class OpenstackConfigTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.openstack_config diff --git a/tests/unit/modules/test_opkg.py b/tests/unit/modules/test_opkg.py index f6d73a4d859..a8614ed8edc 100644 --- a/tests/unit/modules/test_opkg.py +++ b/tests/unit/modules/test_opkg.py @@ -11,12 +11,10 @@ import copy # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -64,7 +62,6 @@ PACKAGES = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class OpkgTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.opkg diff --git a/tests/unit/modules/test_oracle.py b/tests/unit/modules/test_oracle.py index 6672a282ee0..b85dbe24d00 100644 --- a/tests/unit/modules/test_oracle.py +++ b/tests/unit/modules/test_oracle.py @@ -9,19 +9,16 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.oracle as oracle -@skipIf(NO_MOCK, NO_MOCK_REASON) class OracleTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.oracle diff --git a/tests/unit/modules/test_osquery.py b/tests/unit/modules/test_osquery.py index 50052ecd757..a727c89f0b7 100644 --- a/tests/unit/modules/test_osquery.py +++ b/tests/unit/modules/test_osquery.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.osquery as osquery -@skipIf(NO_MOCK, NO_MOCK_REASON) class OSQueryTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.iptables diff --git a/tests/unit/modules/test_pacmanpkg.py b/tests/unit/modules/test_pacmanpkg.py index 80c863c6a5e..dc6b9c0cbe4 100644 --- a/tests/unit/modules/test_pacmanpkg.py +++ b/tests/unit/modules/test_pacmanpkg.py @@ -8,19 +8,16 @@ from __future__ import absolute_import # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.pacmanpkg as pacman -@skipIf(NO_MOCK, NO_MOCK_REASON) class PacmanTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.pacman diff --git a/tests/unit/modules/test_pagerduty.py b/tests/unit/modules/test_pagerduty.py index 721cebf6670..ad702864d8c 100644 --- a/tests/unit/modules/test_pagerduty.py +++ b/tests/unit/modules/test_pagerduty.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -22,7 +20,6 @@ import salt.utils.pagerduty import salt.modules.pagerduty as pagerduty -@skipIf(NO_MOCK, NO_MOCK_REASON) class PagerdutyTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.pagerduty diff --git a/tests/unit/modules/test_pam.py b/tests/unit/modules/test_pam.py index 780463996ea..0ea0ac910bf 100644 --- a/tests/unit/modules/test_pam.py +++ b/tests/unit/modules/test_pam.py @@ -12,8 +12,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, mock_open, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -22,7 +20,6 @@ import salt.modules.pam as pam MOCK_FILE = 'ok ok ignore ' -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(sys.platform.startswith('openbsd'), 'OpenBSD does not use PAM') class PamTestCase(TestCase): ''' diff --git a/tests/unit/modules/test_parallels.py b/tests/unit/modules/test_parallels.py index 953092316ab..694a741243b 100644 --- a/tests/unit/modules/test_parallels.py +++ b/tests/unit/modules/test_parallels.py @@ -10,14 +10,13 @@ from salt.exceptions import SaltInvocationError, CommandExecutionError # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import third party libs from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class ParallelsTestCase(TestCase, LoaderModuleMockMixin): ''' Test parallels desktop execution module functions diff --git a/tests/unit/modules/test_parted_partition.py b/tests/unit/modules/test_parted_partition.py index 8f381d55a6a..70deb61c285 100644 --- a/tests/unit/modules/test_parted_partition.py +++ b/tests/unit/modules/test_parted_partition.py @@ -13,15 +13,14 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt libs from salt.exceptions import CommandExecutionError import salt.modules.parted_partition as parted -@skipIf(NO_MOCK, NO_MOCK_REASON) class PartedTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_pecl.py b/tests/unit/modules/test_pecl.py index adc16c95d3b..d7b0e66865e 100644 --- a/tests/unit/modules/test_pecl.py +++ b/tests/unit/modules/test_pecl.py @@ -7,18 +7,15 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.pecl as pecl -@skipIf(NO_MOCK, NO_MOCK_REASON) class PeclTestCase(TestCase): ''' Test cases for salt.modules.pecl diff --git a/tests/unit/modules/test_pillar.py b/tests/unit/modules/test_pillar.py index 6c058df3404..ef39b953ba0 100644 --- a/tests/unit/modules/test_pillar.py +++ b/tests/unit/modules/test_pillar.py @@ -5,12 +5,10 @@ from __future__ import absolute_import # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt libs @@ -45,13 +43,11 @@ class PillarModuleTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(pillarmod._obfuscate_inner((1, 2)), ('', '')) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_obfuscate(self): with patch('salt.modules.pillar.items', MagicMock(return_value=pillar_value_1)): self.assertEqual(pillarmod.obfuscate(), dict(a='', b='')) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_ls(self): with patch('salt.modules.pillar.items', MagicMock(return_value=pillar_value_1)): ls = sorted(pillarmod.ls()) @@ -60,7 +56,6 @@ class PillarModuleTestCase(TestCase, LoaderModuleMockMixin): else: self.assertEqual(ls, ['a', 'b']) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_pillar_get_default_merge(self): defaults = {'int': 1, 'string': 'foo', diff --git a/tests/unit/modules/test_pip.py b/tests/unit/modules/test_pip.py index c951ab6d032..39a0448363a 100644 --- a/tests/unit/modules/test_pip.py +++ b/tests/unit/modules/test_pip.py @@ -7,8 +7,8 @@ import sys # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.utils.platform @@ -16,7 +16,6 @@ import salt.modules.pip as pip from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class PipTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): return {pip: {'__salt__': {'cmd.which_bin': lambda _: 'pip'}}} diff --git a/tests/unit/modules/test_pkg_resource.py b/tests/unit/modules/test_pkg_resource.py index b6d90cc92c8..02ba11048ab 100644 --- a/tests/unit/modules/test_pkg_resource.py +++ b/tests/unit/modules/test_pkg_resource.py @@ -9,12 +9,10 @@ import yaml # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -24,7 +22,6 @@ import salt.modules.pkg_resource as pkg_resource from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class PkgresTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.pkg_resource diff --git a/tests/unit/modules/test_pkgin.py b/tests/unit/modules/test_pkgin.py index 4cc7167d157..729870dbae0 100644 --- a/tests/unit/modules/test_pkgin.py +++ b/tests/unit/modules/test_pkgin.py @@ -6,19 +6,16 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.pkgin as pkgin -@skipIf(NO_MOCK, NO_MOCK_REASON) class PkginTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.pkgin diff --git a/tests/unit/modules/test_pkgng.py b/tests/unit/modules/test_pkgng.py index ff458a08aaa..2a95b0a9ac5 100644 --- a/tests/unit/modules/test_pkgng.py +++ b/tests/unit/modules/test_pkgng.py @@ -6,10 +6,8 @@ import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -17,7 +15,6 @@ from tests.support.mock import ( import salt.modules.pkgng as pkgng -@skipIf(NO_MOCK, NO_MOCK_REASON) class PkgNgTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.pkgng diff --git a/tests/unit/modules/test_pkgutil.py b/tests/unit/modules/test_pkgutil.py index 462b3c5c444..68e736b2fbd 100644 --- a/tests/unit/modules/test_pkgutil.py +++ b/tests/unit/modules/test_pkgutil.py @@ -8,13 +8,11 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( Mock, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -23,7 +21,6 @@ from salt.exceptions import CommandExecutionError, MinionError import salt.utils.pkg -@skipIf(NO_MOCK, NO_MOCK_REASON) class PkgutilTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.pkgutil diff --git a/tests/unit/modules/test_portage_config.py b/tests/unit/modules/test_portage_config.py index 2ca88a710fd..c056ca70f59 100644 --- a/tests/unit/modules/test_portage_config.py +++ b/tests/unit/modules/test_portage_config.py @@ -12,15 +12,14 @@ import re # Import Salt Testing libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch import salt.utils.files # Import salt libs import salt.modules.portage_config as portage_config -@skipIf(NO_MOCK, NO_MOCK_REASON) class PortageConfigTestCase(TestCase, LoaderModuleMockMixin): class DummyAtom(object): def __init__(self): diff --git a/tests/unit/modules/test_postfix.py b/tests/unit/modules/test_postfix.py index 5eac52ae52b..d4e261483fe 100644 --- a/tests/unit/modules/test_postfix.py +++ b/tests/unit/modules/test_postfix.py @@ -8,10 +8,8 @@ from __future__ import absolute_import # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.modules.postfix as postfix -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostfixTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.postfix diff --git a/tests/unit/modules/test_postgres.py b/tests/unit/modules/test_postgres.py index 03fb7fddfd7..f5cc27fdf27 100644 --- a/tests/unit/modules/test_postgres.py +++ b/tests/unit/modules/test_postgres.py @@ -7,8 +7,8 @@ import re # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock, patch, call +from tests.support.unit import TestCase +from tests.support.mock import Mock, patch, call # Import salt libs import salt.modules.postgres as postgres @@ -51,7 +51,6 @@ test_privileges_list_group_csv = ( ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): patcher = patch('salt.utils.path.which', Mock(return_value='/usr/bin/pgsql')) diff --git a/tests/unit/modules/test_poudriere.py b/tests/unit/modules/test_poudriere.py index f123f35f07c..9873ced17b0 100644 --- a/tests/unit/modules/test_poudriere.py +++ b/tests/unit/modules/test_poudriere.py @@ -9,20 +9,17 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, mock_open, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.poudriere as poudriere -@skipIf(NO_MOCK, NO_MOCK_REASON) class PoudriereTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.poudriere diff --git a/tests/unit/modules/test_powerpath.py b/tests/unit/modules/test_powerpath.py index d16a020b6d6..6636cf65a3b 100644 --- a/tests/unit/modules/test_powerpath.py +++ b/tests/unit/modules/test_powerpath.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.modules.powerpath as powerpath -@skipIf(NO_MOCK, NO_MOCK_REASON) class PowerpathTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.powerpath diff --git a/tests/unit/modules/test_proxy.py b/tests/unit/modules/test_proxy.py index e85e2168a3a..b2fa4203592 100644 --- a/tests/unit/modules/test_proxy.py +++ b/tests/unit/modules/test_proxy.py @@ -8,17 +8,14 @@ import salt.modules.proxy as proxy # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch, call ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class ProxyTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.proxy diff --git a/tests/unit/modules/test_publish.py b/tests/unit/modules/test_publish.py index 4cb9827509a..8cbe5465647 100644 --- a/tests/unit/modules/test_publish.py +++ b/tests/unit/modules/test_publish.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -66,7 +64,6 @@ class Channel(object): pass -@skipIf(NO_MOCK, NO_MOCK_REASON) class PublishTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.publish diff --git a/tests/unit/modules/test_puppet.py b/tests/unit/modules/test_puppet.py index fda080908c9..9ee4e921ba1 100644 --- a/tests/unit/modules/test_puppet.py +++ b/tests/unit/modules/test_puppet.py @@ -10,13 +10,11 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( mock_open, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -26,7 +24,6 @@ import salt.modules.puppet as puppet from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class PuppetTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.puppet diff --git a/tests/unit/modules/test_purefb.py b/tests/unit/modules/test_purefb.py index e3d2a4e958e..5a201f818cf 100644 --- a/tests/unit/modules/test_purefb.py +++ b/tests/unit/modules/test_purefb.py @@ -8,18 +8,15 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.purefb as purefb -@skipIf(NO_MOCK, NO_MOCK_REASON) class PureFBTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.purefb diff --git a/tests/unit/modules/test_pw_group.py b/tests/unit/modules/test_pw_group.py index 5a67ed34d5e..b65bc7d66a5 100644 --- a/tests/unit/modules/test_pw_group.py +++ b/tests/unit/modules/test_pw_group.py @@ -12,8 +12,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.pw_group as pw_group import salt.utils.platform -@skipIf(NO_MOCK, NO_MOCK_REASON) class PwGroupTestCase(TestCase, LoaderModuleMockMixin): ''' Test for salt.module.pw_group diff --git a/tests/unit/modules/test_pw_user.py b/tests/unit/modules/test_pw_user.py index 019e070f31f..38ac4dcc461 100644 --- a/tests/unit/modules/test_pw_user.py +++ b/tests/unit/modules/test_pw_user.py @@ -12,8 +12,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -27,7 +25,6 @@ except ImportError: @skipIf(not HAS_PWD, 'These tests can only run on systems with the python pwd module') -@skipIf(NO_MOCK, NO_MOCK_REASON) class PwUserTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.pw_user diff --git a/tests/unit/modules/test_pyenv.py b/tests/unit/modules/test_pyenv.py index 38d99e7f39a..8cb003c8d6a 100644 --- a/tests/unit/modules/test_pyenv.py +++ b/tests/unit/modules/test_pyenv.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.pyenv as pyenv -@skipIf(NO_MOCK, NO_MOCK_REASON) class PyenvTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.pyenv diff --git a/tests/unit/modules/test_qemu_img.py b/tests/unit/modules/test_qemu_img.py index dd14c9701b0..bc7e5ee9034 100644 --- a/tests/unit/modules/test_qemu_img.py +++ b/tests/unit/modules/test_qemu_img.py @@ -9,19 +9,16 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.qemu_img as qemu_img -@skipIf(NO_MOCK, NO_MOCK_REASON) class QemuimgTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.qemu_img diff --git a/tests/unit/modules/test_qemu_nbd.py b/tests/unit/modules/test_qemu_nbd.py index 7a39a3f58b8..7bd07c1d6fd 100644 --- a/tests/unit/modules/test_qemu_nbd.py +++ b/tests/unit/modules/test_qemu_nbd.py @@ -11,19 +11,16 @@ import tempfile # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.qemu_nbd as qemu_nbd -@skipIf(NO_MOCK, NO_MOCK_REASON) class QemuNbdTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.qemu_nbd diff --git a/tests/unit/modules/test_rabbitmq.py b/tests/unit/modules/test_rabbitmq.py index 408f866c1d6..36c2f7839da 100644 --- a/tests/unit/modules/test_rabbitmq.py +++ b/tests/unit/modules/test_rabbitmq.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.rabbitmq as rabbitmq from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class RabbitmqTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.rabbitmq diff --git a/tests/unit/modules/test_rbenv.py b/tests/unit/modules/test_rbenv.py index 32397f040b4..528925198c5 100644 --- a/tests/unit/modules/test_rbenv.py +++ b/tests/unit/modules/test_rbenv.py @@ -9,10 +9,8 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -20,7 +18,6 @@ from tests.support.mock import ( import salt.modules.rbenv as rbenv -@skipIf(NO_MOCK, NO_MOCK_REASON) class RbenvTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.rbenv diff --git a/tests/unit/modules/test_redismod.py b/tests/unit/modules/test_redismod.py index 5888fe972cf..3f3ade95200 100644 --- a/tests/unit/modules/test_redismod.py +++ b/tests/unit/modules/test_redismod.py @@ -8,10 +8,8 @@ from datetime import datetime # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock) # Import Salt Libs @@ -266,7 +264,6 @@ class MockConnect(object): return 'A' -@skipIf(NO_MOCK, NO_MOCK_REASON) class RedismodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.redismod diff --git a/tests/unit/modules/test_restartcheck.py b/tests/unit/modules/test_restartcheck.py index 7e054cc1b09..f7b4417f72c 100644 --- a/tests/unit/modules/test_restartcheck.py +++ b/tests/unit/modules/test_restartcheck.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libsrestartcheck @@ -22,7 +20,6 @@ import salt.modules.restartcheck as restartcheck # from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class RestartcheckTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.restartcheck diff --git a/tests/unit/modules/test_ret.py b/tests/unit/modules/test_ret.py index 690333bcff0..7103ca04593 100644 --- a/tests/unit/modules/test_ret.py +++ b/tests/unit/modules/test_ret.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.ret as ret import salt.loader -@skipIf(NO_MOCK, NO_MOCK_REASON) class RetTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.ret diff --git a/tests/unit/modules/test_rh_ip.py b/tests/unit/modules/test_rh_ip.py index 8664c067e7d..b1c6583cff5 100644 --- a/tests/unit/modules/test_rh_ip.py +++ b/tests/unit/modules/test_rh_ip.py @@ -8,10 +8,8 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -24,7 +22,6 @@ import jinja2.exceptions from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class RhipTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.rh_ip diff --git a/tests/unit/modules/test_rh_service.py b/tests/unit/modules/test_rh_service.py index b9699ac8ff5..dab0e9d9e2c 100644 --- a/tests/unit/modules/test_rh_service.py +++ b/tests/unit/modules/test_rh_service.py @@ -9,12 +9,10 @@ import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -24,7 +22,6 @@ RET = ['hostname', 'mountall', 'network-interface', 'network-manager', 'salt-api', 'salt-master', 'salt-minion'] -@skipIf(NO_MOCK, NO_MOCK_REASON) class RhServiceTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.rh_service diff --git a/tests/unit/modules/test_riak.py b/tests/unit/modules/test_riak.py index 63f40ba1f5e..b56448d2d8e 100644 --- a/tests/unit/modules/test_riak.py +++ b/tests/unit/modules/test_riak.py @@ -7,17 +7,14 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, patch) # Import Salt Libs import salt.modules.riak as riak -@skipIf(NO_MOCK, NO_MOCK_REASON) class RiakTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.riak diff --git a/tests/unit/modules/test_rpm_lowpkg.py b/tests/unit/modules/test_rpm_lowpkg.py index 0a2359ccb2f..527c8d3bf8c 100644 --- a/tests/unit/modules/test_rpm_lowpkg.py +++ b/tests/unit/modules/test_rpm_lowpkg.py @@ -8,19 +8,16 @@ from __future__ import absolute_import # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.rpm_lowpkg as rpm -@skipIf(NO_MOCK, NO_MOCK_REASON) class RpmTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.rpm diff --git a/tests/unit/modules/test_rsync.py b/tests/unit/modules/test_rsync.py index 7ff967dacfc..73527369344 100644 --- a/tests/unit/modules/test_rsync.py +++ b/tests/unit/modules/test_rsync.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ import salt.modules.rsync as rsync from salt.exceptions import CommandExecutionError, SaltInvocationError -@skipIf(NO_MOCK, NO_MOCK_REASON) class RsyncTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.rsync diff --git a/tests/unit/modules/test_rvm.py b/tests/unit/modules/test_rvm.py index 9ac417f2d06..811db3a95de 100644 --- a/tests/unit/modules/test_rvm.py +++ b/tests/unit/modules/test_rvm.py @@ -5,14 +5,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch, call +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch, call # Import salt libs import salt.modules.rvm as rvm -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestRvmModule(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_s3.py b/tests/unit/modules/test_s3.py index 470bfbd92aa..83316075a77 100644 --- a/tests/unit/modules/test_s3.py +++ b/tests/unit/modules/test_s3.py @@ -7,11 +7,9 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.modules.s3 as s3 -@skipIf(NO_MOCK, NO_MOCK_REASON) class S3TestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_s6.py b/tests/unit/modules/test_s6.py index f5174ffec38..fbd1fc937ae 100644 --- a/tests/unit/modules/test_s6.py +++ b/tests/unit/modules/test_s6.py @@ -9,19 +9,16 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.s6 as s6 -@skipIf(NO_MOCK, NO_MOCK_REASON) class S6TestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.s6 diff --git a/tests/unit/modules/test_salt_version.py b/tests/unit/modules/test_salt_version.py index 0e15a456e22..5bfbc5309a9 100644 --- a/tests/unit/modules/test_salt_version.py +++ b/tests/unit/modules/test_salt_version.py @@ -7,13 +7,8 @@ Unit tests for salt/modules/salt_version.py from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import ( - MagicMock, - patch, - NO_MOCK, - NO_MOCK_REASON -) +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt libs from salt.ext import six @@ -21,7 +16,6 @@ import salt.modules.salt_version as salt_version import salt.version -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltVersionTestCase(TestCase): ''' Test cases for salt.modules.salt_version diff --git a/tests/unit/modules/test_saltcheck.py b/tests/unit/modules/test_saltcheck.py index da0d41c6542..8b41a8e26bb 100644 --- a/tests/unit/modules/test_saltcheck.py +++ b/tests/unit/modules/test_saltcheck.py @@ -15,18 +15,15 @@ except: # Import Salt Testing Libs try: from tests.support.mixins import LoaderModuleMockMixin - from tests.support.unit import skipIf, TestCase + from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) except: raise -@skipIf(NO_MOCK, NO_MOCK_REASON) class LinuxSysctlTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.saltcheck module diff --git a/tests/unit/modules/test_saltcloudmod.py b/tests/unit/modules/test_saltcloudmod.py index 3e480101fab..823ba1c27d5 100644 --- a/tests/unit/modules/test_saltcloudmod.py +++ b/tests/unit/modules/test_saltcloudmod.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.saltcloudmod as saltcloudmod import salt.utils.json -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltcloudmodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.saltcloudmod diff --git a/tests/unit/modules/test_schedule.py b/tests/unit/modules/test_schedule.py index 60c584163e2..884f2576689 100644 --- a/tests/unit/modules/test_schedule.py +++ b/tests/unit/modules/test_schedule.py @@ -10,12 +10,10 @@ import os # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -26,7 +24,6 @@ JOB1 = {'function': 'test.ping', 'maxrunning': 1, 'name': 'job1', 'jid_include': True, 'enabled': True} -@skipIf(NO_MOCK, NO_MOCK_REASON) class ScheduleTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.schedule diff --git a/tests/unit/modules/test_scsi.py b/tests/unit/modules/test_scsi.py index 0004ce43885..8f2186b57b0 100644 --- a/tests/unit/modules/test_scsi.py +++ b/tests/unit/modules/test_scsi.py @@ -9,10 +9,8 @@ import copy # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -22,7 +20,6 @@ import salt.modules.scsi as scsi import salt.utils.path -@skipIf(NO_MOCK, NO_MOCK_REASON) class ScsiTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.scsi diff --git a/tests/unit/modules/test_sdb.py b/tests/unit/modules/test_sdb.py index 6c51f45ef33..6f7bb2d530b 100644 --- a/tests/unit/modules/test_sdb.py +++ b/tests/unit/modules/test_sdb.py @@ -8,17 +8,12 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON -) +from tests.support.unit import TestCase # Import Salt Libs import salt.modules.sdb as sdb -@skipIf(NO_MOCK, NO_MOCK_REASON) class SdbTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.sdb diff --git a/tests/unit/modules/test_seed.py b/tests/unit/modules/test_seed.py index c9246412f8b..9e66ae8ec18 100644 --- a/tests/unit/modules/test_seed.py +++ b/tests/unit/modules/test_seed.py @@ -10,10 +10,8 @@ import uuid # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -24,7 +22,6 @@ import salt.utils.odict import salt.modules.seed as seed -@skipIf(NO_MOCK, NO_MOCK_REASON) class SeedTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.seed diff --git a/tests/unit/modules/test_selinux.py b/tests/unit/modules/test_selinux.py index a9ea0c9c25d..00da3a648d6 100644 --- a/tests/unit/modules/test_selinux.py +++ b/tests/unit/modules/test_selinux.py @@ -3,12 +3,10 @@ # Import Salt Testing Libs from __future__ import absolute_import from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt libs @@ -16,7 +14,6 @@ from salt.exceptions import SaltInvocationError import salt.modules.selinux as selinux -@skipIf(NO_MOCK, NO_MOCK_REASON) class SelinuxModuleTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.selinux diff --git a/tests/unit/modules/test_sensors.py b/tests/unit/modules/test_sensors.py index 5db8d53482a..8d965b34263 100644 --- a/tests/unit/modules/test_sensors.py +++ b/tests/unit/modules/test_sensors.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.modules.sensors as sensors -@skipIf(NO_MOCK, NO_MOCK_REASON) class SensorTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.sensors diff --git a/tests/unit/modules/test_serverdensity_device.py b/tests/unit/modules/test_serverdensity_device.py index 9ab1e7849b6..edb9d90e9bd 100644 --- a/tests/unit/modules/test_serverdensity_device.py +++ b/tests/unit/modules/test_serverdensity_device.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -74,7 +72,6 @@ class MockRequests(object): return self.return_request(url, data, **kwargs) -@skipIf(NO_MOCK, NO_MOCK_REASON) class ServerdensityDeviceTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.serverdensity_device diff --git a/tests/unit/modules/test_service.py b/tests/unit/modules/test_service.py index a182eade583..5d46f361911 100644 --- a/tests/unit/modules/test_service.py +++ b/tests/unit/modules/test_service.py @@ -8,10 +8,8 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.modules.service as service -@skipIf(NO_MOCK, NO_MOCK_REASON) class ServiceTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.service diff --git a/tests/unit/modules/test_servicenow.py b/tests/unit/modules/test_servicenow.py index 5853b267633..5bb8b4e2dce 100644 --- a/tests/unit/modules/test_servicenow.py +++ b/tests/unit/modules/test_servicenow.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON ) import salt.modules.servicenow as servicenow @@ -26,7 +24,6 @@ class MockServiceNowClient(object): 'query_value': query}] -@skipIf(NO_MOCK, NO_MOCK_REASON) class ServiceNowModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): module_globals = { diff --git a/tests/unit/modules/test_smartos_imgadm.py b/tests/unit/modules/test_smartos_imgadm.py index 8d53932280f..a2bbc183227 100644 --- a/tests/unit/modules/test_smartos_imgadm.py +++ b/tests/unit/modules/test_smartos_imgadm.py @@ -12,8 +12,7 @@ from salt.modules.smartos_imgadm import _parse_image_meta # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase image_orphan = { "manifest": { @@ -203,7 +202,6 @@ image_docker = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class ImgadmTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.smartos_imgadm module diff --git a/tests/unit/modules/test_smf_service.py b/tests/unit/modules/test_smf_service.py index 115a4a6049f..ceb41efe3d6 100644 --- a/tests/unit/modules/test_smf_service.py +++ b/tests/unit/modules/test_smf_service.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.modules.smf_service as smf -@skipIf(NO_MOCK, NO_MOCK_REASON) class SmfTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.smf diff --git a/tests/unit/modules/test_smtp.py b/tests/unit/modules/test_smtp.py index 473d9ed94c7..e49b0cb0620 100644 --- a/tests/unit/modules/test_smtp.py +++ b/tests/unit/modules/test_smtp.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -221,7 +219,6 @@ class MockSmtplib(object): return MockSMTP('server') -@skipIf(NO_MOCK, NO_MOCK_REASON) class SmtpTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.smtp diff --git a/tests/unit/modules/test_snapper.py b/tests/unit/modules/test_snapper.py index 67fa8dca3ae..5bbe62f576e 100644 --- a/tests/unit/modules/test_snapper.py +++ b/tests/unit/modules/test_snapper.py @@ -14,8 +14,6 @@ import sys from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch, mock_open, @@ -142,7 +140,6 @@ MODULE_RET = { @skipIf(sys.platform.startswith('win'), 'Snapper not available on Windows') -@skipIf(NO_MOCK, NO_MOCK_REASON) class SnapperTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_solarisipspkg.py b/tests/unit/modules/test_solarisipspkg.py index 5742770dcd8..5bb6d601661 100644 --- a/tests/unit/modules/test_solarisipspkg.py +++ b/tests/unit/modules/test_solarisipspkg.py @@ -10,8 +10,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt libs @@ -20,7 +18,6 @@ import salt.modules.pkg_resource as pkg_resource import salt.utils.data -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(sys.platform != 'solaris', 'Skip when not running on Solaris') class IpsTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_solr.py b/tests/unit/modules/test_solr.py index 0f43700a993..003cdd97638 100644 --- a/tests/unit/modules/test_solr.py +++ b/tests/unit/modules/test_solr.py @@ -8,10 +8,8 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.modules.solr as solr -@skipIf(NO_MOCK, NO_MOCK_REASON) class SolrTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.solr diff --git a/tests/unit/modules/test_sqlite3.py b/tests/unit/modules/test_sqlite3.py index 3bd3118c647..c9743e7d539 100644 --- a/tests/unit/modules/test_sqlite3.py +++ b/tests/unit/modules/test_sqlite3.py @@ -8,11 +8,7 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON -) +from tests.support.unit import TestCase # Import Salt Libs import salt.modules.sqlite3 as sqlite3 @@ -59,7 +55,6 @@ class MockSqlite3(object): return True -@skipIf(NO_MOCK, NO_MOCK_REASON) class Sqlite3TestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.sqlite3 diff --git a/tests/unit/modules/test_ssh.py b/tests/unit/modules/test_ssh.py index 6cd022f0ea0..1bbe7f6d608 100644 --- a/tests/unit/modules/test_ssh.py +++ b/tests/unit/modules/test_ssh.py @@ -6,11 +6,9 @@ import tempfile # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -21,7 +19,6 @@ import salt.modules.ssh as ssh from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class SSHAuthKeyTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.ssh diff --git a/tests/unit/modules/test_state.py b/tests/unit/modules/test_state.py index 8f2805e8f6a..e717a5a0a71 100644 --- a/tests/unit/modules/test_state.py +++ b/tests/unit/modules/test_state.py @@ -15,14 +15,12 @@ import time # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( Mock, MagicMock, patch, mock_open, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -336,7 +334,6 @@ class MockTarFile(object): return True -@skipIf(NO_MOCK, NO_MOCK_REASON) class StateTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.modules.state diff --git a/tests/unit/modules/test_supervisord.py b/tests/unit/modules/test_supervisord.py index 4e61307ee9b..05a1bdc5048 100644 --- a/tests/unit/modules/test_supervisord.py +++ b/tests/unit/modules/test_supervisord.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.supervisord as supervisord from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class SupervisordTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.supervisord diff --git a/tests/unit/modules/test_svn.py b/tests/unit/modules/test_svn.py index 5f94507b85f..a9c1796f81d 100644 --- a/tests/unit/modules/test_svn.py +++ b/tests/unit/modules/test_svn.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.modules.svn as svn -@skipIf(NO_MOCK, NO_MOCK_REASON) class SvnTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.svn diff --git a/tests/unit/modules/test_swift.py b/tests/unit/modules/test_swift.py index d8e78e061a4..10b944555ea 100644 --- a/tests/unit/modules/test_swift.py +++ b/tests/unit/modules/test_swift.py @@ -7,19 +7,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.swift as swift -@skipIf(NO_MOCK, NO_MOCK_REASON) class SwiftTestCase(TestCase): ''' Test cases for salt.modules.swift diff --git a/tests/unit/modules/test_sysbench.py b/tests/unit/modules/test_sysbench.py index d0a82636aea..8d6184de886 100644 --- a/tests/unit/modules/test_sysbench.py +++ b/tests/unit/modules/test_sysbench.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.modules.sysbench as sysbench -@skipIf(NO_MOCK, NO_MOCK_REASON) class SysbenchTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases to salt.modules.sysbench diff --git a/tests/unit/modules/test_syslog_ng.py b/tests/unit/modules/test_syslog_ng.py index e277ecb25f4..a68a32546b7 100644 --- a/tests/unit/modules/test_syslog_ng.py +++ b/tests/unit/modules/test_syslog_ng.py @@ -11,7 +11,7 @@ from textwrap import dedent # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Import Salt libs import salt.utils.platform @@ -56,7 +56,6 @@ _SYSLOG_NG_CTL_NOT_INSTALLED_RETURN_VALUE = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class SyslogNGTestCase(TestCase, LoaderModuleMockMixin): # pylint: disable=blacklisted-function diff --git a/tests/unit/modules/test_sysmod.py b/tests/unit/modules/test_sysmod.py index 4fd86bcef4d..0b02ca49072 100644 --- a/tests/unit/modules/test_sysmod.py +++ b/tests/unit/modules/test_sysmod.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -80,7 +78,6 @@ class Mockloader(object): return sysmod.__salt__ # renderers do not have '.'s; but whatever. This is for convenience -@skipIf(NO_MOCK, NO_MOCK_REASON) class SysmodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.sysmod diff --git a/tests/unit/modules/test_system.py b/tests/unit/modules/test_system.py index af32b3cae87..2ea91f204d7 100644 --- a/tests/unit/modules/test_system.py +++ b/tests/unit/modules/test_system.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.modules.system as system -@skipIf(NO_MOCK, NO_MOCK_REASON) class SystemTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.system diff --git a/tests/unit/modules/test_systemd_service.py b/tests/unit/modules/test_systemd_service.py index deeb23591b7..8b1c492f9dd 100644 --- a/tests/unit/modules/test_systemd_service.py +++ b/tests/unit/modules/test_systemd_service.py @@ -9,12 +9,10 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -63,7 +61,6 @@ timer2.timer disabled timer3.timer static''' -@skipIf(NO_MOCK, NO_MOCK_REASON) class SystemdTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.modules.systemd @@ -261,7 +258,6 @@ class SystemdTestCase(TestCase, LoaderModuleMockMixin): self.assertDictEqual(systemd.execs(), {'a': 'c', 'b': 'c'}) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SystemdScopeTestCase(TestCase, LoaderModuleMockMixin): ''' Test case for salt.modules.systemd, for functions which use systemd diff --git a/tests/unit/modules/test_telegram.py b/tests/unit/modules/test_telegram.py index f45a7e339be..3a7eca9483c 100644 --- a/tests/unit/modules/test_telegram.py +++ b/tests/unit/modules/test_telegram.py @@ -12,12 +12,10 @@ import logging # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( Mock, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -65,7 +63,6 @@ class RequestPutResponseMock(Mock): return {'_id': 4321} -@skipIf(NO_MOCK, NO_MOCK_REASON) class TelegramModuleTest(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.telegram. diff --git a/tests/unit/modules/test_timezone.py b/tests/unit/modules/test_timezone.py index 37d19ff1083..1aa2a766c83 100644 --- a/tests/unit/modules/test_timezone.py +++ b/tests/unit/modules/test_timezone.py @@ -10,8 +10,6 @@ from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch, mock_open ) @@ -27,7 +25,6 @@ GET_ZONE_FILE = 'salt.modules.timezone._get_zone_file' GET_LOCALTIME_PATH = 'salt.modules.timezone._get_localtime_path' -@skipIf(NO_MOCK, NO_MOCK_REASON) class TimezoneTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): @@ -86,7 +83,6 @@ class TimezoneTestCase(TestCase, LoaderModuleMockMixin): return temp -@skipIf(NO_MOCK, NO_MOCK_REASON) class TimezoneModuleTestCase(TestCase, LoaderModuleMockMixin): ''' Timezone test case diff --git a/tests/unit/modules/test_tls.py b/tests/unit/modules/test_tls.py index 1765b99402b..a78ca7d7c4e 100644 --- a/tests/unit/modules/test_tls.py +++ b/tests/unit/modules/test_tls.py @@ -24,8 +24,6 @@ from tests.support.mock import ( mock_open, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -113,7 +111,6 @@ bymYbi0l2pWqQLA2sPoRHNw= # Skip this test case if we don't have access to mock or PyOpenSSL. -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(NO_PYOPENSSL, 'PyOpenSSL must be installed to run these tests.') class TLSAddTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_tuned.py b/tests/unit/modules/test_tuned.py index 0ddd41f2c53..73d2b802e7b 100644 --- a/tests/unit/modules/test_tuned.py +++ b/tests/unit/modules/test_tuned.py @@ -4,16 +4,13 @@ from __future__ import absolute_import from salt.modules import tuned from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch, ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class TunedListTestCase(TestCase, LoaderModuleMockMixin): ''' Test the tuned.list_() method for different versions of tuned-adm diff --git a/tests/unit/modules/test_twilio_notify.py b/tests/unit/modules/test_twilio_notify.py index d1cbfceca1f..91d8f41ce53 100644 --- a/tests/unit/modules/test_twilio_notify.py +++ b/tests/unit/modules/test_twilio_notify.py @@ -12,8 +12,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -95,7 +93,6 @@ class MockTwilioRestClient(object): @skipIf(not HAS_LIBS, 'twilio.rest is not available') -@skipIf(NO_MOCK, NO_MOCK_REASON) class TwilioNotifyTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.twilio_notify diff --git a/tests/unit/modules/test_udev.py b/tests/unit/modules/test_udev.py index 45b17f2c347..c643ce6c6c3 100644 --- a/tests/unit/modules/test_udev.py +++ b/tests/unit/modules/test_udev.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.modules.udev as udev from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class UdevTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.udev diff --git a/tests/unit/modules/test_uptime.py b/tests/unit/modules/test_uptime.py index daced37315e..a58982efff8 100644 --- a/tests/unit/modules/test_uptime.py +++ b/tests/unit/modules/test_uptime.py @@ -5,8 +5,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock +from tests.support.unit import TestCase +from tests.support.mock import Mock # Import salt libs from salt.exceptions import CommandExecutionError @@ -50,7 +50,6 @@ class RequestPutResponseMock(Mock): REQUEST_MOCK = RequestMock() -@skipIf(NO_MOCK, NO_MOCK_REASON) class UptimeTestCase(TestCase, LoaderModuleMockMixin): ''' UptimeTestCase diff --git a/tests/unit/modules/test_useradd.py b/tests/unit/modules/test_useradd.py index 74cafc64409..814146e699d 100644 --- a/tests/unit/modules/test_useradd.py +++ b/tests/unit/modules/test_useradd.py @@ -17,8 +17,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -26,7 +24,6 @@ import salt.modules.useradd as useradd from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class UserAddTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.useradd diff --git a/tests/unit/modules/test_uwsgi.py b/tests/unit/modules/test_uwsgi.py index 809c58d8b84..2eb3cef3c14 100644 --- a/tests/unit/modules/test_uwsgi.py +++ b/tests/unit/modules/test_uwsgi.py @@ -5,14 +5,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, Mock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, Mock, patch # Import salt libs import salt.modules.uwsgi as uwsgi -@skipIf(NO_MOCK, NO_MOCK_REASON) class UwsgiTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_vagrant.py b/tests/unit/modules/test_vagrant.py index 7c636053dc3..d91fdb6bef8 100644 --- a/tests/unit/modules/test_vagrant.py +++ b/tests/unit/modules/test_vagrant.py @@ -6,8 +6,8 @@ import os # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.modules.vagrant as vagrant @@ -17,7 +17,6 @@ import salt.utils.platform TEMP_DATABASE_FILE = '/tmp/salt-tests-tmpdir/test_vagrant.sqlite' -@skipIf(NO_MOCK, NO_MOCK_REASON) class VagrantTestCase(TestCase, LoaderModuleMockMixin): ''' Unit TestCase for the salt.modules.vagrant module. diff --git a/tests/unit/modules/test_varnish.py b/tests/unit/modules/test_varnish.py index 6ce6c8b2df9..df4d9f9033f 100644 --- a/tests/unit/modules/test_varnish.py +++ b/tests/unit/modules/test_varnish.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.modules.varnish as varnish -@skipIf(NO_MOCK, NO_MOCK_REASON) class VarnishTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.varnish diff --git a/tests/unit/modules/test_virt.py b/tests/unit/modules/test_virt.py index 19b73979a62..5c9f81db0c6 100644 --- a/tests/unit/modules/test_virt.py +++ b/tests/unit/modules/test_virt.py @@ -13,8 +13,8 @@ import datetime # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.utils.yaml @@ -49,7 +49,6 @@ class LibvirtMock(MagicMock): # pylint: disable=too-many-ancestors ''' -@skipIf(NO_MOCK, NO_MOCK_REASON) class VirtTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.module.virt diff --git a/tests/unit/modules/test_virtualenv_mod.py b/tests/unit/modules/test_virtualenv_mod.py index 8bda342ce96..3acc1cbde57 100644 --- a/tests/unit/modules/test_virtualenv_mod.py +++ b/tests/unit/modules/test_virtualenv_mod.py @@ -13,16 +13,15 @@ import sys # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.helpers import TstSuiteLoggingHandler, ForceImportErrorOn -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Import salt libs import salt.modules.virtualenv_mod as virtualenv_mod from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class VirtualenvTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/modules/test_vsphere.py b/tests/unit/modules/test_vsphere.py index 5b61aa0257d..ea1d309f109 100644 --- a/tests/unit/modules/test_vsphere.py +++ b/tests/unit/modules/test_vsphere.py @@ -25,8 +25,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, call ) @@ -44,7 +42,6 @@ PASSWORD = 'SuperSecret!' ERROR = 'Some Testing Error Message' -@skipIf(NO_MOCK, NO_MOCK_REASON) class VsphereTestCase(TestCase, LoaderModuleMockMixin): ''' Unit TestCase for the salt.modules.vsphere module. @@ -566,7 +563,6 @@ class VsphereTestCase(TestCase, LoaderModuleMockMixin): vsphere._set_syslog_config_helper(HOST, USER, PASSWORD, config, 'foo')) -@skipIf(NO_MOCK, NO_MOCK_REASON) class GetProxyTypeTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for salt.modules.vsphere.get_proxy_type @@ -581,7 +577,6 @@ class GetProxyTypeTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual('fake_proxy_type', ret) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SupportsProxiesTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for salt.modules.vsphere.supports_proxies decorator @@ -613,7 +608,6 @@ class SupportsProxiesTestCase(TestCase, LoaderModuleMockMixin): excinfo.exception.strerror) -@skipIf(NO_MOCK, NO_MOCK_REASON) class _GetProxyConnectionDetailsTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for salt.modules.vsphere._get_proxy_connection_details @@ -739,7 +733,6 @@ class _GetProxyConnectionDetailsTestCase(TestCase, LoaderModuleMockMixin): excinfo.exception.strerror) -@skipIf(NO_MOCK, NO_MOCK_REASON) class GetsServiceInstanceViaProxyTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for salt.modules.vsphere.gets_service_instance_via_proxy @@ -911,7 +904,6 @@ class GetsServiceInstanceViaProxyTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(ret, self.mock_si) -@skipIf(NO_MOCK, NO_MOCK_REASON) class GetServiceInstanceViaProxyTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for salt.modules.vsphere.get_service_instance_via_proxy @@ -954,7 +946,6 @@ class GetServiceInstanceViaProxyTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(res, mock_si) -@skipIf(NO_MOCK, NO_MOCK_REASON) class DisconnectTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for salt.modules.vsphere.disconnect @@ -991,7 +982,6 @@ class DisconnectTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(res, True) -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestVcenterConnectionTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for salt.modules.vsphere.test_vcenter_connection @@ -1066,7 +1056,6 @@ class TestVcenterConnectionTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(res, False) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class ListDatacentersViaProxyTestCase(TestCase, LoaderModuleMockMixin): ''' @@ -1152,7 +1141,6 @@ class ListDatacentersViaProxyTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(res, [{'name': 'fake_dc1'}, {'name': 'fake_dc2'}]) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class CreateDatacenterTestCase(TestCase, LoaderModuleMockMixin): ''' @@ -1203,7 +1191,6 @@ class CreateDatacenterTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(res, {'create_datacenter': True}) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class EraseDiskPartitionsTestCase(TestCase, LoaderModuleMockMixin): ''' @@ -1292,7 +1279,6 @@ class EraseDiskPartitionsTestCase(TestCase, LoaderModuleMockMixin): self.mock_si, self.mock_host, 'fake_disk_id', hostname='fake_host') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class RemoveDatastoreTestCase(TestCase, LoaderModuleMockMixin): ''' @@ -1382,7 +1368,6 @@ class RemoveDatastoreTestCase(TestCase, LoaderModuleMockMixin): self.assertTrue(res) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class RemoveDiskgroupTestCase(TestCase, LoaderModuleMockMixin): ''' @@ -1477,7 +1462,6 @@ class RemoveDiskgroupTestCase(TestCase, LoaderModuleMockMixin): self.assertTrue(res) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not vsphere.HAS_JSONSCHEMA, 'The \'jsonschema\' library is missing') class RemoveCapacityFromDiskgroupTestCase(TestCase, LoaderModuleMockMixin): @@ -1646,7 +1630,6 @@ class RemoveCapacityFromDiskgroupTestCase(TestCase, LoaderModuleMockMixin): self.assertTrue(res) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class ListClusterTestCase(TestCase, LoaderModuleMockMixin): ''' @@ -1738,7 +1721,6 @@ class ListClusterTestCase(TestCase, LoaderModuleMockMixin): self.mock__get_cluster_dict.assert_called_once_with('cl', self.mock_cl) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class RenameDatastoreTestCase(TestCase, LoaderModuleMockMixin): ''' @@ -1822,7 +1804,6 @@ class RenameDatastoreTestCase(TestCase, LoaderModuleMockMixin): self.mock_ds_ref, 'new_ds_name') -@skipIf(NO_MOCK, NO_MOCK_REASON) class _GetProxyTargetTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for salt.modules.vsphere._get_proxy_target diff --git a/tests/unit/modules/test_webutil.py b/tests/unit/modules/test_webutil.py index 4e40328cdf7..eac01140075 100644 --- a/tests/unit/modules/test_webutil.py +++ b/tests/unit/modules/test_webutil.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.webutil as htpasswd -@skipIf(NO_MOCK, NO_MOCK_REASON) class HtpasswdTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.webutil diff --git a/tests/unit/modules/test_win_disk.py b/tests/unit/modules/test_win_disk.py index 7bcc27f68f6..95d1ec47645 100644 --- a/tests/unit/modules/test_win_disk.py +++ b/tests/unit/modules/test_win_disk.py @@ -8,11 +8,7 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON -) +from tests.support.unit import TestCase # Import Salt Libs import salt.modules.win_disk as win_disk @@ -49,7 +45,6 @@ class MockCtypes(object): self.windll = MockWindll() -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinDiskTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_disk diff --git a/tests/unit/modules/test_win_dns_client.py b/tests/unit/modules/test_win_dns_client.py index c417120f670..698967b75ae 100644 --- a/tests/unit/modules/test_win_dns_client.py +++ b/tests/unit/modules/test_win_dns_client.py @@ -14,8 +14,6 @@ from tests.support.mock import ( MagicMock, patch, Mock, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -65,7 +63,6 @@ class Mockwinapi(object): return True -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_WMI, 'WMI only available on Windows') class WinDnsClientTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_win_file.py b/tests/unit/modules/test_win_file.py index 3ead3ce57e8..55957a9aaf6 100644 --- a/tests/unit/modules/test_win_file.py +++ b/tests/unit/modules/test_win_file.py @@ -9,7 +9,7 @@ import sys # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import MagicMock, patch from tests.support.unit import TestCase, skipIf from tests.support.runtests import RUNTIME_VARS @@ -41,7 +41,6 @@ class DummyStat(object): st_ctime = 1552661253 -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinFileTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_file @@ -105,7 +104,6 @@ class WinFileTestCase(TestCase, LoaderModuleMockMixin): win_file.remove(base) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.utils.platform.is_windows(), 'Skip on Non-Windows systems') class WinFileCheckPermsTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_win_groupadd.py b/tests/unit/modules/test_win_groupadd.py index 048112d893f..8624153af62 100644 --- a/tests/unit/modules/test_win_groupadd.py +++ b/tests/unit/modules/test_win_groupadd.py @@ -13,8 +13,6 @@ from tests.support.mock import ( MagicMock, Mock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -63,12 +61,10 @@ class MockGroupObj(object): pass -if not NO_MOCK: - sam_mock = MagicMock(side_effect=lambda x: 'HOST\\' + x) +sam_mock = MagicMock(side_effect=lambda x: 'HOST\\' + x) @skipIf(not HAS_WIN_LIBS, 'win_groupadd unit tests can only be run if win32com, pythoncom, and pywintypes are installed') -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinGroupTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_groupadd diff --git a/tests/unit/modules/test_win_iis.py b/tests/unit/modules/test_win_iis.py index a215632124e..ee7135b1ed8 100644 --- a/tests/unit/modules/test_win_iis.py +++ b/tests/unit/modules/test_win_iis.py @@ -16,12 +16,10 @@ import salt.utils.json # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, ) APP_LIST = { @@ -116,7 +114,6 @@ CONTAINER_SETTING = { CERT_BINDING_INFO = '*:443:mytestsite.local' -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinIisTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_iis diff --git a/tests/unit/modules/test_win_ip.py b/tests/unit/modules/test_win_ip.py index c8696683087..9b135475fda 100644 --- a/tests/unit/modules/test_win_ip.py +++ b/tests/unit/modules/test_win_ip.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, call ) @@ -38,7 +36,6 @@ ETHERNET_ENABLE = ('Ethernet\n' 'Connect state: Connected') -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinShadowTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_ip diff --git a/tests/unit/modules/test_win_network.py b/tests/unit/modules/test_win_network.py index 411b5f9cf8a..a527c0ddf62 100644 --- a/tests/unit/modules/test_win_network.py +++ b/tests/unit/modules/test_win_network.py @@ -13,8 +13,6 @@ from tests.support.mock import ( MagicMock, patch, Mock, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -63,7 +61,6 @@ class Mockwinapi(object): return False -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinNetworkTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_network diff --git a/tests/unit/modules/test_win_path.py b/tests/unit/modules/test_win_path.py index 891a1314979..da117fb24f2 100644 --- a/tests/unit/modules/test_win_path.py +++ b/tests/unit/modules/test_win_path.py @@ -9,12 +9,10 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -22,7 +20,6 @@ import salt.modules.win_path as win_path import salt.utils.stringutils -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinPathTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_path diff --git a/tests/unit/modules/test_win_pki.py b/tests/unit/modules/test_win_pki.py index a37c9863065..e42e06558a4 100644 --- a/tests/unit/modules/test_win_pki.py +++ b/tests/unit/modules/test_win_pki.py @@ -14,12 +14,10 @@ import salt.modules.win_pki as win_pki # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, ) CERT_PATH = r'C:\certs\testdomain.local.cer' @@ -87,7 +85,6 @@ JSON_STORES = [{ }] -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinPkiTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_pki diff --git a/tests/unit/modules/test_win_powercfg.py b/tests/unit/modules/test_win_powercfg.py index 25b21bffd6e..38434cb2486 100644 --- a/tests/unit/modules/test_win_powercfg.py +++ b/tests/unit/modules/test_win_powercfg.py @@ -8,17 +8,14 @@ import salt.modules.win_powercfg as powercfg # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch, call ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PowerCfgTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the powercfg state diff --git a/tests/unit/modules/test_win_service.py b/tests/unit/modules/test_win_service.py index 61a0d14a97f..faf8ef88111 100644 --- a/tests/unit/modules/test_win_service.py +++ b/tests/unit/modules/test_win_service.py @@ -12,8 +12,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -29,7 +27,6 @@ except ImportError: WINAPI = False -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinServiceTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_service diff --git a/tests/unit/modules/test_win_snmp.py b/tests/unit/modules/test_win_snmp.py index f60a0515db3..dfdfe942ab8 100644 --- a/tests/unit/modules/test_win_snmp.py +++ b/tests/unit/modules/test_win_snmp.py @@ -15,18 +15,15 @@ from salt.exceptions import CommandExecutionError # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, ) COMMUNITY_NAMES = {'TestCommunity': 'Read Create'} -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinSnmpTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_snmp diff --git a/tests/unit/modules/test_win_status.py b/tests/unit/modules/test_win_status.py index 314467023e4..f52c3fd7558 100644 --- a/tests/unit/modules/test_win_status.py +++ b/tests/unit/modules/test_win_status.py @@ -9,7 +9,7 @@ from salt.ext import six # Import Salt Testing libs from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock, patch, ANY +from tests.support.mock import Mock, patch, ANY try: import wmi @@ -20,7 +20,6 @@ except ImportError: import salt.modules.win_status as status -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(status.HAS_WMI is False, 'This test requires Windows') class TestProcsBase(TestCase): def __init__(self, *args, **kwargs): diff --git a/tests/unit/modules/test_win_system.py b/tests/unit/modules/test_win_system.py index 45a7663a495..13c62919e35 100644 --- a/tests/unit/modules/test_win_system.py +++ b/tests/unit/modules/test_win_system.py @@ -14,8 +14,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -23,7 +21,6 @@ import salt.modules.win_system as win_system import salt.utils.platform -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.utils.platform.is_windows(), 'System is not Windows') class WinSystemTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_win_wusa.py b/tests/unit/modules/test_win_wusa.py index ee696063ebc..8396fb802fd 100644 --- a/tests/unit/modules/test_win_wusa.py +++ b/tests/unit/modules/test_win_wusa.py @@ -8,7 +8,7 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.mock import patch, MagicMock from tests.support.unit import TestCase, skipIf # Import Salt Libs @@ -17,7 +17,6 @@ import salt.modules.win_wusa as win_wusa from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.utils.platform.is_windows(), 'System is not Windows') class WinWusaTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/modules/test_x509.py b/tests/unit/modules/test_x509.py index 7030f96484a..624a927becd 100644 --- a/tests/unit/modules/test_x509.py +++ b/tests/unit/modules/test_x509.py @@ -30,8 +30,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) from salt.modules import x509 @@ -45,7 +43,6 @@ except ImportError: HAS_M2CRYPTO = False -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not bool(pytest), False) class X509TestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/modules/test_xapi_virt.py b/tests/unit/modules/test_xapi_virt.py index 38db76187bb..279dd6bf203 100644 --- a/tests/unit/modules/test_xapi_virt.py +++ b/tests/unit/modules/test_xapi_virt.py @@ -8,13 +8,11 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( mock_open, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -64,7 +62,6 @@ class Mockxapi(object): return Mockxapi() -@skipIf(NO_MOCK, NO_MOCK_REASON) class XapiTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.xapi diff --git a/tests/unit/modules/test_yumpkg.py b/tests/unit/modules/test_yumpkg.py index 6113d3a4b13..fe9df4a47f6 100644 --- a/tests/unit/modules/test_yumpkg.py +++ b/tests/unit/modules/test_yumpkg.py @@ -11,8 +11,6 @@ from tests.support.mock import ( Mock, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt libs @@ -60,7 +58,6 @@ LIST_REPOS = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class YumTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.yumpkg diff --git a/tests/unit/modules/test_zabbix.py b/tests/unit/modules/test_zabbix.py index 6f120d56fe6..d88732d8e74 100644 --- a/tests/unit/modules/test_zabbix.py +++ b/tests/unit/modules/test_zabbix.py @@ -10,12 +10,10 @@ import salt.modules.zabbix as zabbix # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) from salt.exceptions import SaltException @@ -96,7 +94,6 @@ DIFF_PARAMS_RESULT_WITH_ROLLBACK = {'new': DIFF_PARAMS_RESULT, 'empty_list': [{'dict_key': 'dic_val'}]}} -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZabbixTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.zabbix diff --git a/tests/unit/modules/test_zfs.py b/tests/unit/modules/test_zfs.py index e92cf2701d6..94573499bf0 100644 --- a/tests/unit/modules/test_zfs.py +++ b/tests/unit/modules/test_zfs.py @@ -15,12 +15,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing libs from tests.support.zfs import ZFSMockData from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, ) # Import Salt Execution module to test @@ -34,7 +32,6 @@ from salt.utils.dateutils import strftime # Skip this test case if we don't have access to mock! -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZfsTestCase(TestCase, LoaderModuleMockMixin): ''' This class contains a set of functions that test salt.modules.zfs module diff --git a/tests/unit/modules/test_znc.py b/tests/unit/modules/test_znc.py index 16178b5c5e2..5cfe82d909b 100644 --- a/tests/unit/modules/test_znc.py +++ b/tests/unit/modules/test_znc.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.modules.znc as znc -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZncTestCase(TestCase, LoaderModuleMockMixin): ''' TestCase for salt.modules.znc diff --git a/tests/unit/modules/test_zpool.py b/tests/unit/modules/test_zpool.py index d3ad2634b9a..8ebb96008c4 100644 --- a/tests/unit/modules/test_zpool.py +++ b/tests/unit/modules/test_zpool.py @@ -19,8 +19,6 @@ from tests.support.unit import skipIf, TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, ) @@ -36,7 +34,6 @@ import salt.utils.decorators.path # Skip this test case if we don't have access to mock! -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZpoolTestCase(TestCase, LoaderModuleMockMixin): ''' This class contains a set of functions that test salt.modules.zpool module diff --git a/tests/unit/modules/test_zypperpkg.py b/tests/unit/modules/test_zypperpkg.py index 3259e1810da..84d4bf590a4 100644 --- a/tests/unit/modules/test_zypperpkg.py +++ b/tests/unit/modules/test_zypperpkg.py @@ -10,14 +10,12 @@ from xml.dom import minidom # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( Mock, MagicMock, call, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt libs @@ -54,7 +52,6 @@ def get_test_data(filename): return rfh.read() -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZypperTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.zypper diff --git a/tests/unit/netapi/test_rest_tornado.py b/tests/unit/netapi/test_rest_tornado.py index a50434ebbf1..99e7ffe9cfa 100644 --- a/tests/unit/netapi/test_rest_tornado.py +++ b/tests/unit/netapi/test_rest_tornado.py @@ -51,7 +51,7 @@ from salt.ext import six from salt.ext.six.moves.urllib.parse import urlencode, urlparse # pylint: disable=no-name-in-module # pylint: enable=import-error -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch @skipIf(not HAS_TORNADO, 'The tornado package needs to be installed') # pylint: disable=W0223 @@ -476,7 +476,6 @@ class TestBaseSaltAPIHandler(SaltnadoTestCase): self.assertEqual(headers["Access-Control-Allow-Origin"], "*") -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestWebhookSaltHandler(SaltnadoTestCase): def get_app(self): diff --git a/tests/unit/pillar/test_consul_pillar.py b/tests/unit/pillar/test_consul_pillar.py index a5243258970..d405249edf0 100644 --- a/tests/unit/pillar/test_consul_pillar.py +++ b/tests/unit/pillar/test_consul_pillar.py @@ -6,7 +6,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.pillar.consul_pillar as consul_pillar @@ -38,7 +38,6 @@ PILLAR_DATA = [ SIMPLE_DICT = {'key1': {'key2': 'val1'}} -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not consul_pillar.consul, 'python-consul module not installed') class ConsulPillarTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/pillar/test_csvpillar.py b/tests/unit/pillar/test_csvpillar.py index 8bd53b48273..a9ff4b3481f 100644 --- a/tests/unit/pillar/test_csvpillar.py +++ b/tests/unit/pillar/test_csvpillar.py @@ -5,14 +5,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import patch, mock_open, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import patch, mock_open # Import Salt Libs import salt.pillar.csvpillar as csvpillar -@skipIf(NO_MOCK, NO_MOCK_REASON) class CSVPillarTestCase(TestCase): def test_001_load_utf8_csv(self): fake_csv = "id,foo,bar\r\nminion1,foo1,bar1" diff --git a/tests/unit/pillar/test_extra_minion_data_in_pillar.py b/tests/unit/pillar/test_extra_minion_data_in_pillar.py index bf21f922cdb..7488ed9ed74 100644 --- a/tests/unit/pillar/test_extra_minion_data_in_pillar.py +++ b/tests/unit/pillar/test_extra_minion_data_in_pillar.py @@ -5,14 +5,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import MagicMock # Import Salt Libs from salt.pillar import extra_minion_data_in_pillar -@skipIf(NO_MOCK, NO_MOCK_REASON) class ExtraMinionDataInPillarTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.pillar.extra_minion_data_in_pillar diff --git a/tests/unit/pillar/test_file_tree.py b/tests/unit/pillar/test_file_tree.py index ebc718a9221..0521bff4139 100644 --- a/tests/unit/pillar/test_file_tree.py +++ b/tests/unit/pillar/test_file_tree.py @@ -13,8 +13,8 @@ import shutil # Import Salt Testing libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock from tests.support.helpers import TstSuiteLoggingHandler # Import Salt Libs @@ -46,7 +46,6 @@ FILE_DATA = { _CHECK_MINIONS_RETURN = {'minions': [MINION_ID], 'missing': []} -@skipIf(NO_MOCK, NO_MOCK_REASON) class FileTreePillarTestCase(TestCase, LoaderModuleMockMixin): 'test file_tree pillar' maxDiff = None diff --git a/tests/unit/pillar/test_hg_pillar.py b/tests/unit/pillar/test_hg_pillar.py index 78117216afa..452d15cbcbe 100644 --- a/tests/unit/pillar/test_hg_pillar.py +++ b/tests/unit/pillar/test_hg_pillar.py @@ -12,7 +12,6 @@ import subprocess # Import Salt Testing libs from tests.support.mixins import AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON from tests.support.runtests import RUNTIME_VARS @@ -31,7 +30,6 @@ import salt.pillar.hg_pillar as hg_pillar HGLIB = hg_pillar.hglib -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HGLIB is None, 'python-hglib library not installed') class HgPillarTestCase(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin): 'test hg_pillar pillar' diff --git a/tests/unit/pillar/test_mysql.py b/tests/unit/pillar/test_mysql.py index f6a2d0a44b6..94ecde8c20d 100644 --- a/tests/unit/pillar/test_mysql.py +++ b/tests/unit/pillar/test_mysql.py @@ -5,13 +5,11 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON # Import Salt Libs import salt.pillar.mysql as mysql -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(mysql.MySQLdb is None, 'MySQL-python module not installed') class MysqlPillarTestCase(TestCase): maxDiff = None diff --git a/tests/unit/pillar/test_saltclass.py b/tests/unit/pillar/test_saltclass.py index 3df84804cf9..f8a4e1f7e78 100644 --- a/tests/unit/pillar/test_saltclass.py +++ b/tests/unit/pillar/test_saltclass.py @@ -6,8 +6,7 @@ import os # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase # Import Salt Libs import salt.pillar.saltclass as saltclass @@ -24,7 +23,6 @@ fake_salt = {} fake_grains = {} -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltclassPillarTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for salt.pillar.saltclass @@ -49,7 +47,6 @@ class SaltclassPillarTestCase(TestCase, LoaderModuleMockMixin): self._runner(ret) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltclassPillarTestCaseListExpansion(TestCase, LoaderModuleMockMixin): ''' Tests for salt.pillar.saltclass variable expansion in list diff --git a/tests/unit/pillar/test_sqlcipher.py b/tests/unit/pillar/test_sqlcipher.py index 69c6c1a5054..84382a90aac 100644 --- a/tests/unit/pillar/test_sqlcipher.py +++ b/tests/unit/pillar/test_sqlcipher.py @@ -4,14 +4,12 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase # Import Salt Libs import salt.pillar.sqlcipher as sqlcipher -@skipIf(NO_MOCK, NO_MOCK_REASON) class SQLCipherPillarTestCase(TestCase): maxDiff = None diff --git a/tests/unit/pillar/test_sqlite3.py b/tests/unit/pillar/test_sqlite3.py index 11a1ce03e6a..f22423b6e5f 100644 --- a/tests/unit/pillar/test_sqlite3.py +++ b/tests/unit/pillar/test_sqlite3.py @@ -4,14 +4,12 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase # Import Salt Libs import salt.pillar.sqlite3 as sqlite3 -@skipIf(NO_MOCK, NO_MOCK_REASON) class SQLite3PillarTestCase(TestCase): maxDiff = None diff --git a/tests/unit/proxy/test_esxcluster.py b/tests/unit/proxy/test_esxcluster.py index 1a2bc5988b2..a7e79394c1b 100644 --- a/tests/unit/proxy/test_esxcluster.py +++ b/tests/unit/proxy/test_esxcluster.py @@ -26,12 +26,9 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_JSONSCHEMA, 'jsonschema is required') class InitTestCase(TestCase, LoaderModuleMockMixin): '''Tests for salt.proxy.esxcluster.init''' diff --git a/tests/unit/proxy/test_esxdatacenter.py b/tests/unit/proxy/test_esxdatacenter.py index 98104eb1460..89f2e55881a 100644 --- a/tests/unit/proxy/test_esxdatacenter.py +++ b/tests/unit/proxy/test_esxdatacenter.py @@ -26,12 +26,9 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_JSONSCHEMA, 'jsonschema is required') class InitTestCase(TestCase, LoaderModuleMockMixin): '''Tests for salt.proxy.esxdatacenter.init''' diff --git a/tests/unit/proxy/test_napalm.py b/tests/unit/proxy/test_napalm.py index 14a806d0965..a450fa3cd38 100644 --- a/tests/unit/proxy/test_napalm.py +++ b/tests/unit/proxy/test_napalm.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -35,7 +33,6 @@ def mock_get_device(opts, *args, **kwargs): } -@skipIf(NO_MOCK, NO_MOCK_REASON) @patch('salt.utils.napalm.get_device', mock_get_device) class NapalmProxyTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/renderers/test_aws_kms.py b/tests/unit/renderers/test_aws_kms.py index 5855859f740..50305b2959d 100644 --- a/tests/unit/renderers/test_aws_kms.py +++ b/tests/unit/renderers/test_aws_kms.py @@ -12,8 +12,6 @@ from __future__ import absolute_import, print_function, unicode_literals from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -45,7 +43,6 @@ AWS_PROFILE = 'test-profile' REGION_NAME = 'us-test-1' -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(NO_BOTOCORE, 'Unable to import botocore libraries') class AWSKMSTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/renderers/test_gpg.py b/tests/unit/renderers/test_gpg.py index 9099b4262e0..20af25b678d 100644 --- a/tests/unit/renderers/test_gpg.py +++ b/tests/unit/renderers/test_gpg.py @@ -7,10 +7,8 @@ from textwrap import dedent # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -20,7 +18,6 @@ import salt.renderers.gpg as gpg from salt.exceptions import SaltRenderError -@skipIf(NO_MOCK, NO_MOCK_REASON) class GPGTestCase(TestCase, LoaderModuleMockMixin): ''' unit test GPG renderer diff --git a/tests/unit/renderers/test_nacl.py b/tests/unit/renderers/test_nacl.py index de0e7029780..34e6227d03c 100644 --- a/tests/unit/renderers/test_nacl.py +++ b/tests/unit/renderers/test_nacl.py @@ -5,10 +5,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -17,7 +15,6 @@ from tests.support.mock import ( import salt.renderers.nacl as nacl -@skipIf(NO_MOCK, NO_MOCK_REASON) class NaclTestCase(TestCase, LoaderModuleMockMixin): ''' unit test NaCl renderer diff --git a/tests/unit/returners/test_local_cache.py b/tests/unit/returners/test_local_cache.py index 15c84f7a6e2..267ad317395 100644 --- a/tests/unit/returners/test_local_cache.py +++ b/tests/unit/returners/test_local_cache.py @@ -18,11 +18,9 @@ import time # Import Salt Testing libs from tests.support.mixins import AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin from tests.support.runtests import RUNTIME_VARS -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -37,7 +35,6 @@ from salt.ext import six log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class LocalCacheCleanOldJobsTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for the local_cache.clean_old_jobs function. diff --git a/tests/unit/returners/test_pgjsonb.py b/tests/unit/returners/test_pgjsonb.py index 00cedc186ae..831464a15c9 100644 --- a/tests/unit/returners/test_pgjsonb.py +++ b/tests/unit/returners/test_pgjsonb.py @@ -12,11 +12,9 @@ import logging # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -26,7 +24,6 @@ import salt.returners.pgjsonb as pgjsonb log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PGJsonbCleanOldJobsTestCase(TestCase, LoaderModuleMockMixin): ''' Tests for the local_cache.clean_old_jobs function. diff --git a/tests/unit/returners/test_slack_webhook_return.py b/tests/unit/returners/test_slack_webhook_return.py index 68c33c58442..cdea753011b 100644 --- a/tests/unit/returners/test_slack_webhook_return.py +++ b/tests/unit/returners/test_slack_webhook_return.py @@ -13,14 +13,13 @@ from __future__ import absolute_import # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.unit import TestCase +from tests.support.mock import patch # Import Salt libs import salt.returners.slack_webhook_return as slack_webhook -@skipIf(NO_MOCK, NO_MOCK_REASON) class SlackWebhookReturnerTestCase(TestCase, LoaderModuleMockMixin): ''' Test slack_webhook returner diff --git a/tests/unit/returners/test_smtp_return.py b/tests/unit/returners/test_smtp_return.py index 72682969192..c000a29e6fe 100644 --- a/tests/unit/returners/test_smtp_return.py +++ b/tests/unit/returners/test_smtp_return.py @@ -12,8 +12,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.returners.smtp_return as smtp @@ -26,7 +26,6 @@ except ImportError: HAS_GNUPG = False -@skipIf(NO_MOCK, NO_MOCK_REASON) class SMTPReturnerTestCase(TestCase, LoaderModuleMockMixin): ''' Test SMTP returner diff --git a/tests/unit/returners/test_syslog_return.py b/tests/unit/returners/test_syslog_return.py index 4980c95368b..a89ff8b056d 100644 --- a/tests/unit/returners/test_syslog_return.py +++ b/tests/unit/returners/test_syslog_return.py @@ -13,13 +13,12 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Import salt libs import salt.returners.syslog_return as syslog -@skipIf(NO_MOCK, NO_MOCK_REASON) class SyslogReturnerTestCase(TestCase, LoaderModuleMockMixin): ''' Test Syslog returner diff --git a/tests/unit/returners/test_telegram_return.py b/tests/unit/returners/test_telegram_return.py index 417abcd8892..2a6ec6a66af 100644 --- a/tests/unit/returners/test_telegram_return.py +++ b/tests/unit/returners/test_telegram_return.py @@ -11,14 +11,13 @@ from __future__ import absolute_import # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.returners.telegram_return as telegram -@skipIf(NO_MOCK, NO_MOCK_REASON) class TelegramReturnerTestCase(TestCase, LoaderModuleMockMixin): ''' Test Telegram Returner diff --git a/tests/unit/roster/test_ansible.py b/tests/unit/roster/test_ansible.py index 94191d47710..a2ea996324e 100644 --- a/tests/unit/roster/test_ansible.py +++ b/tests/unit/roster/test_ansible.py @@ -6,8 +6,6 @@ import os # Import Salt Testing Libs from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, patch ) from tests.support import mixins @@ -55,7 +53,6 @@ EXPECTED = { @skipIf(not salt.utils.path.which('ansible-inventory'), 'Skipping because ansible-inventory is not available') -@skipIf(NO_MOCK, NO_MOCK_REASON) class AnsibleRosterTestCase(TestCase, mixins.LoaderModuleMockMixin): @classmethod diff --git a/tests/unit/roster/test_clustershell.py b/tests/unit/roster/test_clustershell.py index 4e9b32c7c2c..43c7003832d 100644 --- a/tests/unit/roster/test_clustershell.py +++ b/tests/unit/roster/test_clustershell.py @@ -8,8 +8,6 @@ from __future__ import absolute_import # Import Salt Testing libraries from tests.support.unit import TestCase, skipIf from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -21,7 +19,6 @@ except (ImportError, OSError) as e: HAS_CLUSTERSHELL = False -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_CLUSTERSHELL is False, 'Install Python Clustershell bindings before running these tests.') class ClusterShellTestCase(TestCase): ''' diff --git a/tests/unit/roster/test_sshconfig.py b/tests/unit/roster/test_sshconfig.py index 77a6a06a50b..a06fa39f792 100644 --- a/tests/unit/roster/test_sshconfig.py +++ b/tests/unit/roster/test_sshconfig.py @@ -7,12 +7,10 @@ import collections # Import Salt Testing Libs from tests.support.mock import ( mock_open, - NO_MOCK, - NO_MOCK_REASON, patch ) from tests.support import mixins -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase # Import Salt Libs import salt.roster.sshconfig as sshconfig @@ -67,7 +65,6 @@ _ABC_GLOB = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class SSHConfigRosterTestCase(TestCase, mixins.LoaderModuleMockMixin): def setUp(self): diff --git a/tests/unit/roster/test_terraform.py b/tests/unit/roster/test_terraform.py index 8d1be9a1058..bc9fefd6fa6 100644 --- a/tests/unit/roster/test_terraform.py +++ b/tests/unit/roster/test_terraform.py @@ -8,12 +8,10 @@ import os.path # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.runtests import RUNTIME_VARS from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -22,7 +20,6 @@ import salt.loader from salt.roster import terraform -@skipIf(NO_MOCK, NO_MOCK_REASON) class TerraformTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.roster.terraform diff --git a/tests/unit/runners/test_cache.py b/tests/unit/runners/test_cache.py index b58d234fbdd..686c3c78e5b 100644 --- a/tests/unit/runners/test_cache.py +++ b/tests/unit/runners/test_cache.py @@ -9,10 +9,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -21,7 +19,6 @@ import salt.runners.cache as cache import salt.utils.master -@skipIf(NO_MOCK, NO_MOCK_REASON) class CacheTest(TestCase, LoaderModuleMockMixin): ''' Validate the cache runner diff --git a/tests/unit/runners/test_jobs.py b/tests/unit/runners/test_jobs.py index 0b0b66037dc..f0a18fc5a73 100644 --- a/tests/unit/runners/test_jobs.py +++ b/tests/unit/runners/test_jobs.py @@ -8,10 +8,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -20,7 +18,6 @@ import salt.runners.jobs as jobs import salt.minion -@skipIf(NO_MOCK, NO_MOCK_REASON) class JobsTest(TestCase, LoaderModuleMockMixin): ''' Validate the jobs runner diff --git a/tests/unit/runners/test_queue.py b/tests/unit/runners/test_queue.py index 7d32fcf719e..3fd41dd3541 100644 --- a/tests/unit/runners/test_queue.py +++ b/tests/unit/runners/test_queue.py @@ -10,10 +10,8 @@ import os # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -22,7 +20,6 @@ from tests.support.mock import ( import salt.runners.queue as queue_mod -@skipIf(NO_MOCK, NO_MOCK_REASON) class QueueTest(TestCase, LoaderModuleMockMixin): ''' Validate the queue runner diff --git a/tests/unit/runners/test_vault.py b/tests/unit/runners/test_vault.py index 25f06b78b4a..c9ae7aa10a2 100644 --- a/tests/unit/runners/test_vault.py +++ b/tests/unit/runners/test_vault.py @@ -9,13 +9,11 @@ import logging # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, Mock, patch, - NO_MOCK, - NO_MOCK_REASON, ANY, call ) @@ -113,7 +111,6 @@ class VaultTest(TestCase, LoaderModuleMockMixin): log.debug('Difference:\n\t%s', diff) self.assertEqual(output, correct_output) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_get_policies(self): ''' Ensure _get_policies works as intended, including expansion of lists diff --git a/tests/unit/runners/test_winrepo.py b/tests/unit/runners/test_winrepo.py index bd9255bd049..f97b9df10a9 100644 --- a/tests/unit/runners/test_winrepo.py +++ b/tests/unit/runners/test_winrepo.py @@ -9,8 +9,7 @@ import tempfile # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase # Import salt libs import salt.utils.files @@ -74,7 +73,6 @@ _WINREPO_GENREPO_DATA = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinrepoTest(TestCase, LoaderModuleMockMixin): ''' Test the winrepo runner diff --git a/tests/unit/sdb/test_yaml.py b/tests/unit/sdb/test_yaml.py index d7b2932ee91..d2144641555 100644 --- a/tests/unit/sdb/test_yaml.py +++ b/tests/unit/sdb/test_yaml.py @@ -7,10 +7,8 @@ Test case for the YAML SDB module from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.sdb.yaml as sdb -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestYamlRenderer(TestCase): ''' Test case for the YAML SDB module diff --git a/tests/unit/states/test_alias.py b/tests/unit/states/test_alias.py index dc164bab01f..059ef3bc57c 100644 --- a/tests/unit/states/test_alias.py +++ b/tests/unit/states/test_alias.py @@ -8,10 +8,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -20,7 +18,6 @@ from tests.support.mock import ( import salt.states.alias as alias -@skipIf(NO_MOCK, NO_MOCK_REASON) class AliasTest(TestCase, LoaderModuleMockMixin): ''' Validate the alias state diff --git a/tests/unit/states/test_alternatives.py b/tests/unit/states/test_alternatives.py index 7f9ec8a5169..af2c0d8fe0c 100644 --- a/tests/unit/states/test_alternatives.py +++ b/tests/unit/states/test_alternatives.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.alternatives as alternatives -@skipIf(NO_MOCK, NO_MOCK_REASON) class AlternativesTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.alternatives diff --git a/tests/unit/states/test_apache.py b/tests/unit/states/test_apache.py index 798d0254d80..412a366edb0 100644 --- a/tests/unit/states/test_apache.py +++ b/tests/unit/states/test_apache.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch, mock_open) @@ -20,7 +18,6 @@ import salt.states.apache as apache import salt.utils.files -@skipIf(NO_MOCK, NO_MOCK_REASON) class ApacheTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.apache diff --git a/tests/unit/states/test_apache_conf.py b/tests/unit/states/test_apache_conf.py index c42a87580cb..084c76f9d75 100644 --- a/tests/unit/states/test_apache_conf.py +++ b/tests/unit/states/test_apache_conf.py @@ -4,10 +4,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -16,7 +14,6 @@ from tests.support.mock import ( import salt.states.apache_conf as apache_conf -@skipIf(NO_MOCK, NO_MOCK_REASON) class ApacheConfTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.apache_conf diff --git a/tests/unit/states/test_apache_module.py b/tests/unit/states/test_apache_module.py index 9421cbe1acb..3d43deb0e43 100644 --- a/tests/unit/states/test_apache_module.py +++ b/tests/unit/states/test_apache_module.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.apache_module as apache_module -@skipIf(NO_MOCK, NO_MOCK_REASON) class ApacheModuleTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.apache_module diff --git a/tests/unit/states/test_apache_site.py b/tests/unit/states/test_apache_site.py index b0c2b8ec838..f199c63260f 100644 --- a/tests/unit/states/test_apache_site.py +++ b/tests/unit/states/test_apache_site.py @@ -4,10 +4,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -16,7 +14,6 @@ from tests.support.mock import ( import salt.states.apache_site as apache_site -@skipIf(NO_MOCK, NO_MOCK_REASON) class ApacheSiteTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.apache_site diff --git a/tests/unit/states/test_aptpkg.py b/tests/unit/states/test_aptpkg.py index 96011cc4602..30bd6986b46 100644 --- a/tests/unit/states/test_aptpkg.py +++ b/tests/unit/states/test_aptpkg.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.aptpkg as aptpkg -@skipIf(NO_MOCK, NO_MOCK_REASON) class AptTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.aptpkg diff --git a/tests/unit/states/test_archive.py b/tests/unit/states/test_archive.py index 602000ba879..849df5745e7 100644 --- a/tests/unit/states/test_archive.py +++ b/tests/unit/states/test_archive.py @@ -9,10 +9,8 @@ import os # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -46,7 +44,6 @@ def _isfile_side_effect(path): }[path.lower() if salt.utils.platform.is_windows() else path] -@skipIf(NO_MOCK, NO_MOCK_REASON) class ArchiveTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/states/test_artifactory.py b/tests/unit/states/test_artifactory.py index 0b5c6ea4935..adf3ded728e 100644 --- a/tests/unit/states/test_artifactory.py +++ b/tests/unit/states/test_artifactory.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.artifactory as artifactory -@skipIf(NO_MOCK, NO_MOCK_REASON) class ArtifactoryTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.artifactory diff --git a/tests/unit/states/test_at.py b/tests/unit/states/test_at.py index 4a4b75954c6..4ceb29a78ee 100644 --- a/tests/unit/states/test_at.py +++ b/tests/unit/states/test_at.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.at as at -@skipIf(NO_MOCK, NO_MOCK_REASON) class AtTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.at diff --git a/tests/unit/states/test_augeas.py b/tests/unit/states/test_augeas.py index 269cfb2cb0b..4e74299bdc2 100644 --- a/tests/unit/states/test_augeas.py +++ b/tests/unit/states/test_augeas.py @@ -9,11 +9,9 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( mock_open, - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -22,7 +20,6 @@ from tests.support.mock import ( import salt.states.augeas as augeas -@skipIf(NO_MOCK, NO_MOCK_REASON) class AugeasTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.augeas diff --git a/tests/unit/states/test_aws_sqs.py b/tests/unit/states/test_aws_sqs.py index 63f2f61e9f9..063e61bd799 100644 --- a/tests/unit/states/test_aws_sqs.py +++ b/tests/unit/states/test_aws_sqs.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.aws_sqs as aws_sqs -@skipIf(NO_MOCK, NO_MOCK_REASON) class AwsSqsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.aws_sqs diff --git a/tests/unit/states/test_beacon.py b/tests/unit/states/test_beacon.py index 38fd42c911f..93b5e93cb80 100644 --- a/tests/unit/states/test_beacon.py +++ b/tests/unit/states/test_beacon.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.beacon as beacon -@skipIf(NO_MOCK, NO_MOCK_REASON) class BeaconTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.beacon diff --git a/tests/unit/states/test_blockdev.py b/tests/unit/states/test_blockdev.py index ebb4bdd384a..0f37afb0205 100644 --- a/tests/unit/states/test_blockdev.py +++ b/tests/unit/states/test_blockdev.py @@ -8,10 +8,8 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, Mock, MagicMock, patch) @@ -21,7 +19,6 @@ import salt.states.blockdev as blockdev import salt.utils.path -@skipIf(NO_MOCK, NO_MOCK_REASON) class BlockdevTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.blockdev diff --git a/tests/unit/states/test_boto_apigateway.py b/tests/unit/states/test_boto_apigateway.py index 172921ad340..8d5a034f0d3 100644 --- a/tests/unit/states/test_boto_apigateway.py +++ b/tests/unit/states/test_boto_apigateway.py @@ -11,7 +11,7 @@ import string # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Import Salt libs import salt.config @@ -446,7 +446,6 @@ class BotoApiGatewayStateTestCaseBase(TestCase, LoaderModuleMockMixin): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoApiGatewayTestCase(BotoApiGatewayStateTestCaseBase, BotoApiGatewayTestCaseMixin): ''' TestCase for salt.modules.boto_apigateway state.module @@ -1025,7 +1024,6 @@ class BotoApiGatewayTestCase(BotoApiGatewayStateTestCaseBase, BotoApiGatewayTest @skipIf(_has_required_botocore() is False, 'The botocore module must be greater than' ' or equal to version {0}'.format(required_botocore_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoApiGatewayUsagePlanTestCase(BotoApiGatewayStateTestCaseBase, BotoApiGatewayTestCaseMixin): ''' TestCase for salt.modules.boto_apigateway state.module, usage_plans portion @@ -1303,7 +1301,6 @@ class BotoApiGatewayUsagePlanTestCase(BotoApiGatewayStateTestCaseBase, BotoApiGa @skipIf(_has_required_botocore() is False, 'The botocore module must be greater than' ' or equal to version {0}'.format(required_botocore_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoApiGatewayUsagePlanAssociationTestCase(BotoApiGatewayStateTestCaseBase, BotoApiGatewayTestCaseMixin): ''' TestCase for salt.modules.boto_apigateway state.module, usage_plans_association portion diff --git a/tests/unit/states/test_boto_asg.py b/tests/unit/states/test_boto_asg.py index ab55b1bb0ec..275ec234400 100644 --- a/tests/unit/states/test_boto_asg.py +++ b/tests/unit/states/test_boto_asg.py @@ -7,14 +7,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.states.boto_asg as boto_asg -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoAsgTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_asg diff --git a/tests/unit/states/test_boto_cloudfront.py b/tests/unit/states/test_boto_cloudfront.py index a55c0146b04..5db1b2ad847 100644 --- a/tests/unit/states/test_boto_cloudfront.py +++ b/tests/unit/states/test_boto_cloudfront.py @@ -9,8 +9,8 @@ import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.config @@ -18,7 +18,6 @@ import salt.loader import salt.states.boto_cloudfront as boto_cloudfront -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoCloudfrontTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_cloudfront diff --git a/tests/unit/states/test_boto_cloudtrail.py b/tests/unit/states/test_boto_cloudtrail.py index d25fd0ab1aa..93c3367a547 100644 --- a/tests/unit/states/test_boto_cloudtrail.py +++ b/tests/unit/states/test_boto_cloudtrail.py @@ -12,8 +12,6 @@ from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -102,7 +100,6 @@ if _has_required_boto(): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoCloudTrailStateTestCaseBase(TestCase, LoaderModuleMockMixin): conn = None diff --git a/tests/unit/states/test_boto_cloudwatch_alarm.py b/tests/unit/states/test_boto_cloudwatch_alarm.py index a9ffd13a8a0..758166d347f 100644 --- a/tests/unit/states/test_boto_cloudwatch_alarm.py +++ b/tests/unit/states/test_boto_cloudwatch_alarm.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.boto_cloudwatch_alarm as boto_cloudwatch_alarm -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoCloudwatchAlarmTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_cloudwatch_alarm diff --git a/tests/unit/states/test_boto_cloudwatch_event.py b/tests/unit/states/test_boto_cloudwatch_event.py index 42932373eaa..9d0008fb5a3 100644 --- a/tests/unit/states/test_boto_cloudwatch_event.py +++ b/tests/unit/states/test_boto_cloudwatch_event.py @@ -9,7 +9,7 @@ import logging # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.mock import patch, MagicMock # Import Salt libs import salt.config @@ -133,7 +133,6 @@ class BotoCloudWatchEventStateTestCaseBase(TestCase, LoaderModuleMockMixin): @skipIf(HAS_BOTO is False, 'The boto module must be installed.') -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoCloudWatchEventTestCase(BotoCloudWatchEventStateTestCaseBase, BotoCloudWatchEventTestCaseMixin): def test_present_when_failing_to_describe_rule(self): ''' diff --git a/tests/unit/states/test_boto_cognitoidentity.py b/tests/unit/states/test_boto_cognitoidentity.py index 6fb21ca1e66..71439fc2de8 100644 --- a/tests/unit/states/test_boto_cognitoidentity.py +++ b/tests/unit/states/test_boto_cognitoidentity.py @@ -10,7 +10,7 @@ import logging # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.mock import patch, MagicMock # Import Salt libs import salt.config @@ -181,7 +181,6 @@ class BotoCognitoIdentityStateTestCaseBase(TestCase, LoaderModuleMockMixin): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoCognitoIdentityTestCase(BotoCognitoIdentityStateTestCaseBase, BotoCognitoIdentityTestCaseMixin): ''' TestCase for salt.states.boto_cognitoidentity state.module diff --git a/tests/unit/states/test_boto_dynamodb.py b/tests/unit/states/test_boto_dynamodb.py index a4c02e67fd1..e94f0786bc5 100644 --- a/tests/unit/states/test_boto_dynamodb.py +++ b/tests/unit/states/test_boto_dynamodb.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.boto_dynamodb as boto_dynamodb -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoDynamodbTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_dynamodb diff --git a/tests/unit/states/test_boto_ec2.py b/tests/unit/states/test_boto_ec2.py index 0f6408475ed..20bc53d2eae 100644 --- a/tests/unit/states/test_boto_ec2.py +++ b/tests/unit/states/test_boto_ec2.py @@ -7,14 +7,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.states.boto_ec2 as boto_ec2 -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoEc2TestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_ec2 diff --git a/tests/unit/states/test_boto_elasticache.py b/tests/unit/states/test_boto_elasticache.py index 5ee6145d9e9..56c4c3c36f9 100644 --- a/tests/unit/states/test_boto_elasticache.py +++ b/tests/unit/states/test_boto_elasticache.py @@ -7,14 +7,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.states.boto_elasticache as boto_elasticache -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoElasticacheTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_elasticache diff --git a/tests/unit/states/test_boto_elasticsearch_domain.py b/tests/unit/states/test_boto_elasticsearch_domain.py index ce52a3db3e8..2484a2cccde 100644 --- a/tests/unit/states/test_boto_elasticsearch_domain.py +++ b/tests/unit/states/test_boto_elasticsearch_domain.py @@ -9,7 +9,7 @@ import string # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import MagicMock, patch # Import Salt libs from salt.ext import six @@ -140,7 +140,6 @@ class BotoElasticsearchDomainStateTestCaseBase(TestCase, LoaderModuleMockMixin): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoElasticsearchDomainTestCase(BotoElasticsearchDomainStateTestCaseBase, BotoElasticsearchDomainTestCaseMixin): ''' TestCase for salt.modules.boto_elasticsearch_domain state.module diff --git a/tests/unit/states/test_boto_elb.py b/tests/unit/states/test_boto_elb.py index 87291ef180e..69c49664ddd 100644 --- a/tests/unit/states/test_boto_elb.py +++ b/tests/unit/states/test_boto_elb.py @@ -8,10 +8,8 @@ import copy # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.boto_elb as boto_elb -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoElbTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_elb diff --git a/tests/unit/states/test_boto_iam_role.py b/tests/unit/states/test_boto_iam_role.py index b9789e3bf8f..4792035d1ed 100644 --- a/tests/unit/states/test_boto_iam_role.py +++ b/tests/unit/states/test_boto_iam_role.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.boto_iam_role as boto_iam_role -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoIAMRoleTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_iam_role diff --git a/tests/unit/states/test_boto_iot.py b/tests/unit/states/test_boto_iot.py index 1ea8ac74d47..e03aa33a817 100644 --- a/tests/unit/states/test_boto_iot.py +++ b/tests/unit/states/test_boto_iot.py @@ -9,7 +9,7 @@ import string # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import MagicMock, patch # Import Salt libs import salt.config @@ -133,7 +133,6 @@ if _has_required_boto(): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoIoTStateTestCaseBase(TestCase, LoaderModuleMockMixin): conn = None @@ -400,7 +399,6 @@ class BotoIoTPolicyTestCase(BotoIoTStateTestCaseBase, BotoIoTTestCaseMixin): ' module must be greater than or equal to' ' version {1}.' .format(required_boto3_version, required_botocore_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoIoTTopicRuleTestCase(BotoIoTStateTestCaseBase, BotoIoTTestCaseMixin): ''' TestCase for salt.modules.boto_iot state.module rules diff --git a/tests/unit/states/test_boto_kinesis.py b/tests/unit/states/test_boto_kinesis.py index 3605e00467d..4ef3d1ba518 100644 --- a/tests/unit/states/test_boto_kinesis.py +++ b/tests/unit/states/test_boto_kinesis.py @@ -4,10 +4,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -15,7 +13,6 @@ from tests.support.mock import ( import salt.states.boto_kinesis as boto_kinesis -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoKinesisTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_kinesis diff --git a/tests/unit/states/test_boto_lambda.py b/tests/unit/states/test_boto_lambda.py index a8fbb802655..99e9d64768c 100644 --- a/tests/unit/states/test_boto_lambda.py +++ b/tests/unit/states/test_boto_lambda.py @@ -9,7 +9,7 @@ import string # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import MagicMock, patch # Import Salt libs import salt.config @@ -101,7 +101,6 @@ def _has_required_boto(): ('The boto3 module must be greater than or equal to version {0}, ' 'and botocore must be greater than or equal to {1}'.format( required_boto3_version, required_botocore_version))) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoLambdaStateTestCaseBase(TestCase, LoaderModuleMockMixin): conn = None @@ -307,7 +306,6 @@ class BotoLambdaFunctionTestCase(BotoLambdaStateTestCaseBase, BotoLambdaTestCase ('The boto3 module must be greater than or equal to version {0}, ' 'and botocore must be greater than or equal to {1}'.format( required_boto3_version, required_botocore_version))) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoLambdaAliasTestCase(BotoLambdaStateTestCaseBase, BotoLambdaTestCaseMixin): ''' TestCase for salt.modules.boto_lambda state.module aliases @@ -393,7 +391,6 @@ class BotoLambdaAliasTestCase(BotoLambdaStateTestCaseBase, BotoLambdaTestCaseMix ('The boto3 module must be greater than or equal to version {0}, ' 'and botocore must be greater than or equal to {1}'.format( required_boto3_version, required_botocore_version))) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoLambdaEventSourceMappingTestCase(BotoLambdaStateTestCaseBase, BotoLambdaTestCaseMixin): ''' TestCase for salt.modules.boto_lambda state.module event_source_mappings diff --git a/tests/unit/states/test_boto_lc.py b/tests/unit/states/test_boto_lc.py index 61401b9b142..62cc3f196ae 100644 --- a/tests/unit/states/test_boto_lc.py +++ b/tests/unit/states/test_boto_lc.py @@ -7,15 +7,14 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.states.boto_lc as boto_lc from salt.exceptions import SaltInvocationError -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoLcTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_lc diff --git a/tests/unit/states/test_boto_route53.py b/tests/unit/states/test_boto_route53.py index 808b5697038..d0b66b2f351 100644 --- a/tests/unit/states/test_boto_route53.py +++ b/tests/unit/states/test_boto_route53.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.boto_route53 as boto_route53 -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoRoute53TestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_route53 diff --git a/tests/unit/states/test_boto_s3_bucket.py b/tests/unit/states/test_boto_s3_bucket.py index 5d166ebf770..8c6c96b083c 100644 --- a/tests/unit/states/test_boto_s3_bucket.py +++ b/tests/unit/states/test_boto_s3_bucket.py @@ -10,7 +10,7 @@ import string # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import MagicMock, patch # Import Salt libs from salt.ext import six @@ -264,7 +264,6 @@ if _has_required_boto(): @skipIf(_has_required_boto() is False, 'The boto3 module must be greater than' ' or equal to version {0}' .format(required_boto3_version)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoS3BucketStateTestCaseBase(TestCase, LoaderModuleMockMixin): conn = None diff --git a/tests/unit/states/test_boto_sns.py b/tests/unit/states/test_boto_sns.py index 0d33ab22a4c..70da6084729 100644 --- a/tests/unit/states/test_boto_sns.py +++ b/tests/unit/states/test_boto_sns.py @@ -7,14 +7,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.states.boto_sns as boto_sns -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoSnsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_sns diff --git a/tests/unit/states/test_boto_sqs.py b/tests/unit/states/test_boto_sqs.py index 7b4a56214ff..edecaf558e3 100644 --- a/tests/unit/states/test_boto_sqs.py +++ b/tests/unit/states/test_boto_sqs.py @@ -8,8 +8,8 @@ import textwrap # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.config @@ -17,7 +17,6 @@ import salt.loader import salt.states.boto_sqs as boto_sqs -@skipIf(NO_MOCK, NO_MOCK_REASON) class BotoSqsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.boto_sqs diff --git a/tests/unit/states/test_boto_vpc.py b/tests/unit/states/test_boto_vpc.py index 321a4a5db4a..4e574055d41 100644 --- a/tests/unit/states/test_boto_vpc.py +++ b/tests/unit/states/test_boto_vpc.py @@ -10,7 +10,7 @@ import sys # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import patch from tests.support.runtests import RUNTIME_VARS @@ -126,7 +126,6 @@ class BotoVpcStateTestCaseBase(TestCase, LoaderModuleMockMixin): conn_parameters['key'] = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(50)) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -279,7 +278,6 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin): self.assertTrue('Mocked error' in resource_absent_result['comment']) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -292,7 +290,6 @@ class BotoVpcSubnetsTestCase(BotoVpcStateTestCaseBase, BotoVpcResourceTestCaseMi extra_kwargs = {'cidr_block': cidr_block} -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' @@ -304,7 +301,6 @@ class BotoVpcInternetGatewayTestCase(BotoVpcStateTestCaseBase, BotoVpcResourceTe backend_delete = 'InternetGatewayBackend.delete_internet_gateway' -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(six.PY3, 'Disabled for Python 3 due to upstream bugs: ' 'https://github.com/spulec/moto/issues/548 and ' 'https://github.com/gabrielfalcao/HTTPretty/issues/325') diff --git a/tests/unit/states/test_bower.py b/tests/unit/states/test_bower.py index d591643ae62..c0ee24a8b10 100644 --- a/tests/unit/states/test_bower.py +++ b/tests/unit/states/test_bower.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.states.bower as bower from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) class BowerTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.bower diff --git a/tests/unit/states/test_chef.py b/tests/unit/states/test_chef.py index 79861156ddb..53bdf8db84d 100644 --- a/tests/unit/states/test_chef.py +++ b/tests/unit/states/test_chef.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.chef as chef -@skipIf(NO_MOCK, NO_MOCK_REASON) class ChefTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.chef diff --git a/tests/unit/states/test_cloud.py b/tests/unit/states/test_cloud.py index 26bc9cb6341..1f40d7bcba1 100644 --- a/tests/unit/states/test_cloud.py +++ b/tests/unit/states/test_cloud.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ import salt.states.cloud as cloud import salt.utils.cloud -@skipIf(NO_MOCK, NO_MOCK_REASON) class CloudTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.cloud diff --git a/tests/unit/states/test_cmd.py b/tests/unit/states/test_cmd.py index 34056bb7a03..738fcdad6b4 100644 --- a/tests/unit/states/test_cmd.py +++ b/tests/unit/states/test_cmd.py @@ -8,10 +8,8 @@ import os.path # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -21,7 +19,6 @@ from salt.exceptions import CommandExecutionError import salt.states.cmd as cmd -@skipIf(NO_MOCK, NO_MOCK_REASON) class CmdTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.cmd diff --git a/tests/unit/states/test_composer.py b/tests/unit/states/test_composer.py index 649194702e5..7a2984e8ad7 100644 --- a/tests/unit/states/test_composer.py +++ b/tests/unit/states/test_composer.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -20,7 +18,6 @@ from salt.exceptions import SaltException import salt.states.composer as composer -@skipIf(NO_MOCK, NO_MOCK_REASON) class ComposerTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.composer diff --git a/tests/unit/states/test_cron.py b/tests/unit/states/test_cron.py index d399d628e5f..1d42e3a94b8 100644 --- a/tests/unit/states/test_cron.py +++ b/tests/unit/states/test_cron.py @@ -8,8 +8,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch from salt.ext.six.moves import StringIO import salt.modules.cron as cronmod @@ -53,7 +53,6 @@ def write_crontab(*args, **kw): } -@skipIf(NO_MOCK, NO_MOCK_REASON) class CronTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/states/test_cyg.py b/tests/unit/states/test_cyg.py index 2ea792a4db9..c01338cc109 100644 --- a/tests/unit/states/test_cyg.py +++ b/tests/unit/states/test_cyg.py @@ -4,7 +4,7 @@ # # Import Salt Testing libs # from tests.support.unit import skipIf, TestCase -# from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +# from tests.support.mock import MagicMock, patch # # Late import so mock can do its job # import salt.states.cyg as cyg @@ -12,7 +12,6 @@ # cyg.__opts__ = {'test': False} -# @skipIf(NO_MOCK, NO_MOCK_REASON) # class TestGemState(TestCase): # def test_installed(self): diff --git a/tests/unit/states/test_ddns.py b/tests/unit/states/test_ddns.py index 7b373503559..adb79a95cd0 100644 --- a/tests/unit/states/test_ddns.py +++ b/tests/unit/states/test_ddns.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.ddns as ddns -@skipIf(NO_MOCK, NO_MOCK_REASON) class DdnsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ddns diff --git a/tests/unit/states/test_debconfmod.py b/tests/unit/states/test_debconfmod.py index 3951ae54d7b..b05afac255d 100644 --- a/tests/unit/states/test_debconfmod.py +++ b/tests/unit/states/test_debconfmod.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.debconfmod as debconfmod -@skipIf(NO_MOCK, NO_MOCK_REASON) class DebconfmodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.debconfmod diff --git a/tests/unit/states/test_disk.py b/tests/unit/states/test_disk.py index 189fd2b0922..64ac2a917f8 100644 --- a/tests/unit/states/test_disk.py +++ b/tests/unit/states/test_disk.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) from os import path @@ -19,7 +17,6 @@ from os import path import salt.states.disk as disk -@skipIf(NO_MOCK, NO_MOCK_REASON) class DiskTestCase(TestCase, LoaderModuleMockMixin): ''' Test disk state diff --git a/tests/unit/states/test_docker_image.py b/tests/unit/states/test_docker_image.py index df77541a568..416267bf86b 100644 --- a/tests/unit/states/test_docker_image.py +++ b/tests/unit/states/test_docker_image.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -21,7 +19,6 @@ import salt.modules.dockermod as docker_mod import salt.states.docker_image as docker_state -@skipIf(NO_MOCK, NO_MOCK_REASON) class DockerImageTestCase(TestCase, LoaderModuleMockMixin): ''' Test docker_image states diff --git a/tests/unit/states/test_docker_volume.py b/tests/unit/states/test_docker_volume.py index 862acb9d739..f62ea0a655d 100644 --- a/tests/unit/states/test_docker_volume.py +++ b/tests/unit/states/test_docker_volume.py @@ -8,11 +8,9 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( Mock, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -21,7 +19,6 @@ import salt.modules.dockermod as docker_mod import salt.states.docker_volume as docker_state -@skipIf(NO_MOCK, NO_MOCK_REASON) class DockerVolumeTestCase(TestCase, LoaderModuleMockMixin): ''' Test docker_volume states diff --git a/tests/unit/states/test_drac.py b/tests/unit/states/test_drac.py index daacd63e988..ef6560be145 100644 --- a/tests/unit/states/test_drac.py +++ b/tests/unit/states/test_drac.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.drac as drac -@skipIf(NO_MOCK, NO_MOCK_REASON) class DracTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.drac diff --git a/tests/unit/states/test_elasticsearch.py b/tests/unit/states/test_elasticsearch.py index 243fb0ca757..c8bf3debaa5 100644 --- a/tests/unit/states/test_elasticsearch.py +++ b/tests/unit/states/test_elasticsearch.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -21,7 +19,6 @@ import salt.utils.dictdiffer as dictdiffer from salt.states import elasticsearch -@skipIf(NO_MOCK, NO_MOCK_REASON) class ElasticsearchTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.elasticsearch diff --git a/tests/unit/states/test_eselect.py b/tests/unit/states/test_eselect.py index 782a02ebdc7..9030727ab32 100644 --- a/tests/unit/states/test_eselect.py +++ b/tests/unit/states/test_eselect.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.eselect as eselect -@skipIf(NO_MOCK, NO_MOCK_REASON) class EselectTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.eselect diff --git a/tests/unit/states/test_esxdatacenter.py b/tests/unit/states/test_esxdatacenter.py index 38d6f9a86b6..53348c92e00 100644 --- a/tests/unit/states/test_esxdatacenter.py +++ b/tests/unit/states/test_esxdatacenter.py @@ -14,16 +14,13 @@ from salt.exceptions import CommandExecutionError # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class DatacenterConfiguredTestCase(TestCase, LoaderModuleMockMixin): '''Tests for salt.modules.esxdatacenter.datacenter_configured''' diff --git a/tests/unit/states/test_event.py b/tests/unit/states/test_event.py index 7b3e1246a4f..cb0878df258 100644 --- a/tests/unit/states/test_event.py +++ b/tests/unit/states/test_event.py @@ -10,16 +10,13 @@ import salt.states.event as event # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class EventTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the event state diff --git a/tests/unit/states/test_file.py b/tests/unit/states/test_file.py index e455316e66c..d761b8704fd 100644 --- a/tests/unit/states/test_file.py +++ b/tests/unit/states/test_file.py @@ -20,8 +20,6 @@ from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.helpers import destructiveTest from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, Mock, MagicMock, call, @@ -44,7 +42,6 @@ from salt.ext.six.moves import range import salt.utils.win_functions -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestFileState(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/states/test_gem.py b/tests/unit/states/test_gem.py index 5ae42146654..0f63a06f95f 100644 --- a/tests/unit/states/test_gem.py +++ b/tests/unit/states/test_gem.py @@ -5,14 +5,13 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Late import so mock can do its job import salt.states.gem as gem -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestGemState(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/states/test_git.py b/tests/unit/states/test_git.py index d67a0317dd5..3248f4d58fc 100644 --- a/tests/unit/states/test_git.py +++ b/tests/unit/states/test_git.py @@ -11,14 +11,12 @@ import os # Import Salt Testing Libs from tests.support.helpers import with_tempdir from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( Mock, MagicMock, patch, DEFAULT, - NO_MOCK, - NO_MOCK_REASON, ) # Import Salt Libs @@ -27,7 +25,6 @@ import salt.states.git as git_state # Don't potentially shadow GitPython log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class GitTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.git diff --git a/tests/unit/states/test_glusterfs.py b/tests/unit/states/test_glusterfs.py index c1a91ca61d1..795847e9f66 100644 --- a/tests/unit/states/test_glusterfs.py +++ b/tests/unit/states/test_glusterfs.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -21,7 +19,6 @@ import salt.utils.network import salt.modules.glusterfs as mod_glusterfs -@skipIf(NO_MOCK, NO_MOCK_REASON) class GlusterfsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.glusterfs diff --git a/tests/unit/states/test_gnomedesktop.py b/tests/unit/states/test_gnomedesktop.py index 2e270a8ab34..912ed99e4db 100644 --- a/tests/unit/states/test_gnomedesktop.py +++ b/tests/unit/states/test_gnomedesktop.py @@ -6,16 +6,12 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON) +from tests.support.unit import TestCase # Import Salt Libs import salt.states.gnomedesktop as gnomedesktop -@skipIf(NO_MOCK, NO_MOCK_REASON) class GnomedesktopTestCase(TestCase): ''' Test cases for salt.states.gnomedesktop diff --git a/tests/unit/states/test_grafana.py b/tests/unit/states/test_grafana.py index e39cd7823d2..83b9a7791d9 100644 --- a/tests/unit/states/test_grafana.py +++ b/tests/unit/states/test_grafana.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -21,7 +19,6 @@ import salt.states.grafana as grafana from salt.exceptions import SaltInvocationError -@skipIf(NO_MOCK, NO_MOCK_REASON) class GrafanaTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.grafana diff --git a/tests/unit/states/test_grafana_datasource.py b/tests/unit/states/test_grafana_datasource.py index bd146c7269a..aef1f8a4a33 100644 --- a/tests/unit/states/test_grafana_datasource.py +++ b/tests/unit/states/test_grafana_datasource.py @@ -4,10 +4,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, Mock, MagicMock, patch @@ -28,7 +26,6 @@ def mock_json_response(data): return Mock(return_value=response) -@skipIf(NO_MOCK, NO_MOCK_REASON) class GrafanaDatasourceTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): return {grafana_datasource: {}} diff --git a/tests/unit/states/test_grains.py b/tests/unit/states/test_grains.py index ffaceb345a3..65f6cc6df68 100644 --- a/tests/unit/states/test_grains.py +++ b/tests/unit/states/test_grains.py @@ -12,8 +12,8 @@ import contextlib # Import Salt Testing libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.utils.files @@ -24,7 +24,6 @@ import salt.states.grains as grains from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class GrainsTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/states/test_group.py b/tests/unit/states/test_group.py index b91cc5e5b50..5dba7c51a1a 100644 --- a/tests/unit/states/test_group.py +++ b/tests/unit/states/test_group.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ import salt.states.group as group from salt.utils.odict import OrderedDict -@skipIf(NO_MOCK, NO_MOCK_REASON) class GroupTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the group state diff --git a/tests/unit/states/test_hg.py b/tests/unit/states/test_hg.py index 0eb00d4d8d2..d1b5efe302a 100644 --- a/tests/unit/states/test_hg.py +++ b/tests/unit/states/test_hg.py @@ -11,16 +11,13 @@ import salt.states.hg as hg # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class HgTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the svn state diff --git a/tests/unit/states/test_host.py b/tests/unit/states/test_host.py index 645a3d8a75f..dc114d2a9de 100644 --- a/tests/unit/states/test_host.py +++ b/tests/unit/states/test_host.py @@ -10,17 +10,14 @@ import salt.states.host as host # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, call, patch, ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class HostTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the host state diff --git a/tests/unit/states/test_http.py b/tests/unit/states/test_http.py index 68dcc971744..82050bfdf23 100644 --- a/tests/unit/states/test_http.py +++ b/tests/unit/states/test_http.py @@ -10,16 +10,13 @@ import salt.states.http as http # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class HttpTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the HTTP state diff --git a/tests/unit/states/test_incron.py b/tests/unit/states/test_incron.py index 4fc49836032..d6dcba00c80 100644 --- a/tests/unit/states/test_incron.py +++ b/tests/unit/states/test_incron.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.incron as incron -@skipIf(NO_MOCK, NO_MOCK_REASON) class IncronTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.incron diff --git a/tests/unit/states/test_influxdb08_database.py b/tests/unit/states/test_influxdb08_database.py index 21ee2472dd8..e2f8fa168ba 100644 --- a/tests/unit/states/test_influxdb08_database.py +++ b/tests/unit/states/test_influxdb08_database.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.influxdb08_database as influxdb08_database -@skipIf(NO_MOCK, NO_MOCK_REASON) class InfluxdbDatabaseTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.influxdb08_database diff --git a/tests/unit/states/test_influxdb08_user.py b/tests/unit/states/test_influxdb08_user.py index ebc596c16c3..930f037ea18 100644 --- a/tests/unit/states/test_influxdb08_user.py +++ b/tests/unit/states/test_influxdb08_user.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.influxdb08_user as influxdb08_user -@skipIf(NO_MOCK, NO_MOCK_REASON) class InfluxdbUserTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.influxdb08_user diff --git a/tests/unit/states/test_ini_manage.py b/tests/unit/states/test_ini_manage.py index bbfa4cbc7f2..e0707f871b4 100644 --- a/tests/unit/states/test_ini_manage.py +++ b/tests/unit/states/test_ini_manage.py @@ -7,11 +7,9 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch) # Import Salt Libs @@ -20,7 +18,6 @@ import salt.states.ini_manage as ini_manage # pylint: disable=no-member -@skipIf(NO_MOCK, NO_MOCK_REASON) class IniManageTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ini_manage diff --git a/tests/unit/states/test_ipmi.py b/tests/unit/states/test_ipmi.py index 2b4047d8c36..f7a929b32e7 100644 --- a/tests/unit/states/test_ipmi.py +++ b/tests/unit/states/test_ipmi.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.ipmi as ipmi -@skipIf(NO_MOCK, NO_MOCK_REASON) class IpmiTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ipmi diff --git a/tests/unit/states/test_ipset.py b/tests/unit/states/test_ipset.py index 0a549db3762..5c33bc8f417 100644 --- a/tests/unit/states/test_ipset.py +++ b/tests/unit/states/test_ipset.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, call, patch) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.ipset as ipset -@skipIf(NO_MOCK, NO_MOCK_REASON) class IpsetSetPresentTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ipset.present @@ -82,7 +79,6 @@ class IpsetSetPresentTestCase(TestCase, LoaderModuleMockMixin): self._runner(ret, new_set='') -@skipIf(NO_MOCK, NO_MOCK_REASON) class IpsetSetAbsentTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ipset.present @@ -144,7 +140,6 @@ class IpsetSetAbsentTestCase(TestCase, LoaderModuleMockMixin): self._runner(ret, delete_set=True, flush_assertion=True, delete_set_assertion=True) -@skipIf(NO_MOCK, NO_MOCK_REASON) class IpsetPresentTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ipset.present @@ -221,7 +216,6 @@ class IpsetPresentTestCase(TestCase, LoaderModuleMockMixin): self.assertDictEqual(ipset.present(self.fake_name), ret) -@skipIf(NO_MOCK, NO_MOCK_REASON) class IpsetAbsentTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ipset.present @@ -296,7 +290,6 @@ class IpsetAbsentTestCase(TestCase, LoaderModuleMockMixin): self.assertDictEqual(ipset.absent(self.fake_name), ret) -@skipIf(NO_MOCK, NO_MOCK_REASON) class IpsetFlushTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ipset.present diff --git a/tests/unit/states/test_iptables.py b/tests/unit/states/test_iptables.py index ff96e29d1d6..90afa1ea3ea 100644 --- a/tests/unit/states/test_iptables.py +++ b/tests/unit/states/test_iptables.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.iptables as iptables -@skipIf(NO_MOCK, NO_MOCK_REASON) class IptablesTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the iptables state diff --git a/tests/unit/states/test_jboss7.py b/tests/unit/states/test_jboss7.py index 8f1913633f0..d71915dae1e 100644 --- a/tests/unit/states/test_jboss7.py +++ b/tests/unit/states/test_jboss7.py @@ -6,8 +6,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt libs import salt.states.jboss7 as jboss7 @@ -15,7 +15,6 @@ from salt.exceptions import CommandExecutionError from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class JBoss7StateTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/states/test_kernelpkg.py b/tests/unit/states/test_kernelpkg.py index 4a81aacbf47..12cdf32ff91 100644 --- a/tests/unit/states/test_kernelpkg.py +++ b/tests/unit/states/test_kernelpkg.py @@ -18,8 +18,6 @@ try: from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -33,7 +31,6 @@ KERNEL_LIST = ['4.4.0-70-generic', '4.4.0-71-generic', '4.5.1-14-generic'] STATE_NAME = 'kernelpkg-test' -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_MODULES, 'Salt modules could not be loaded') class KernelPkgTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/states/test_keyboard.py b/tests/unit/states/test_keyboard.py index c1d171d02c7..c015ec00d86 100644 --- a/tests/unit/states/test_keyboard.py +++ b/tests/unit/states/test_keyboard.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.keyboard as keyboard -@skipIf(NO_MOCK, NO_MOCK_REASON) class KeyboardTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.keyboard diff --git a/tests/unit/states/test_keystone.py b/tests/unit/states/test_keystone.py index 81b0b3edf06..0161fa7838d 100644 --- a/tests/unit/states/test_keystone.py +++ b/tests/unit/states/test_keystone.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.keystone as keystone -@skipIf(NO_MOCK, NO_MOCK_REASON) class KeystoneTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.keystone diff --git a/tests/unit/states/test_keystore.py b/tests/unit/states/test_keystore.py index ee64c633cfb..34d35f08bb2 100644 --- a/tests/unit/states/test_keystore.py +++ b/tests/unit/states/test_keystore.py @@ -7,18 +7,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, - MagicMock, - patch) +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import Salt Libs import salt.states.keystore as keystore -@skipIf(NO_MOCK, NO_MOCK_REASON) class KeystoreTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.keystore diff --git a/tests/unit/states/test_kmod.py b/tests/unit/states/test_kmod.py index 6144e79ff41..a820d0cdfa3 100644 --- a/tests/unit/states/test_kmod.py +++ b/tests/unit/states/test_kmod.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.kmod as kmod -@skipIf(NO_MOCK, NO_MOCK_REASON) class KmodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.kmod diff --git a/tests/unit/states/test_kubernetes.py b/tests/unit/states/test_kubernetes.py index fd5cd3e12ac..670f4975320 100644 --- a/tests/unit/states/test_kubernetes.py +++ b/tests/unit/states/test_kubernetes.py @@ -13,8 +13,6 @@ from contextlib import contextmanager from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -24,7 +22,6 @@ from salt.states import kubernetes from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(kubernetes is False, "Probably Kubernetes client lib is not installed. \ Skipping test_kubernetes.py") class KubernetesTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/states/test_layman.py b/tests/unit/states/test_layman.py index 5e446e9c36e..b738e02cf08 100644 --- a/tests/unit/states/test_layman.py +++ b/tests/unit/states/test_layman.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.layman as layman -@skipIf(NO_MOCK, NO_MOCK_REASON) class LaymanTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.layman diff --git a/tests/unit/states/test_ldap.py b/tests/unit/states/test_ldap.py index e3ceb81f605..b8066ba76c0 100644 --- a/tests/unit/states/test_ldap.py +++ b/tests/unit/states/test_ldap.py @@ -17,8 +17,7 @@ import salt.states.ldap from salt.utils.oset import OrderedSet from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase # emulates the LDAP database. each key is the DN of an entry and it # maps to a dict which maps attribute names to sets of values. @@ -164,7 +163,6 @@ def _dump_db(d=None): for dn in d)) -@skipIf(NO_MOCK, NO_MOCK_REASON) class LDAPTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/states/test_libcloud_dns.py b/tests/unit/states/test_libcloud_dns.py index 9ff794d4d5f..108d1d274fb 100644 --- a/tests/unit/states/test_libcloud_dns.py +++ b/tests/unit/states/test_libcloud_dns.py @@ -8,11 +8,7 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON -) +from tests.support.unit import TestCase import salt.states.libcloud_dns as libcloud_dns from salt.modules.libcloud_dns import _simple_record, _simple_zone @@ -37,7 +33,6 @@ class DNSTestRecord(object): self.extra = {} -@skipIf(NO_MOCK, NO_MOCK_REASON) class LibcloudDnsModuleTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/states/test_linux_acl.py b/tests/unit/states/test_linux_acl.py index 54f359983c2..a86706b0fa4 100644 --- a/tests/unit/states/test_linux_acl.py +++ b/tests/unit/states/test_linux_acl.py @@ -10,8 +10,6 @@ import sys from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -21,7 +19,6 @@ import salt.states.linux_acl as linux_acl from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not sys.platform.startswith('linux'), 'Test for Linux only') class LinuxAclTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/states/test_locale.py b/tests/unit/states/test_locale.py index 765cf9414d8..ec1d3332b82 100644 --- a/tests/unit/states/test_locale.py +++ b/tests/unit/states/test_locale.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.locale as locale -@skipIf(NO_MOCK, NO_MOCK_REASON) class LocaleTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the locale state diff --git a/tests/unit/states/test_loop.py b/tests/unit/states/test_loop.py index 6b26e9911c1..185a7d56c4c 100644 --- a/tests/unit/states/test_loop.py +++ b/tests/unit/states/test_loop.py @@ -8,14 +8,13 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import MagicMock # Import Salt Libs import salt.states.loop as loop -@skipIf(NO_MOCK, NO_MOCK_REASON) class LoopTestCase(TestCase, LoaderModuleMockMixin): mock = MagicMock(return_value=True) diff --git a/tests/unit/states/test_lvm.py b/tests/unit/states/test_lvm.py index 1e1e687ff40..2b99717925d 100644 --- a/tests/unit/states/test_lvm.py +++ b/tests/unit/states/test_lvm.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.lvm as lvm -@skipIf(NO_MOCK, NO_MOCK_REASON) class LvmTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.lvm diff --git a/tests/unit/states/test_lvs_server.py b/tests/unit/states/test_lvs_server.py index 1707acc7aa1..402ec90dd75 100644 --- a/tests/unit/states/test_lvs_server.py +++ b/tests/unit/states/test_lvs_server.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.lvs_server as lvs_server -@skipIf(NO_MOCK, NO_MOCK_REASON) class LvsServerTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.lvs_server diff --git a/tests/unit/states/test_lvs_service.py b/tests/unit/states/test_lvs_service.py index fb251dac2b0..9efb46ef535 100644 --- a/tests/unit/states/test_lvs_service.py +++ b/tests/unit/states/test_lvs_service.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.lvs_service as lvs_service -@skipIf(NO_MOCK, NO_MOCK_REASON) class LvsServiceTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.lvs_service diff --git a/tests/unit/states/test_lxc.py b/tests/unit/states/test_lxc.py index 2b0a8e2c101..372ded7bce3 100644 --- a/tests/unit/states/test_lxc.py +++ b/tests/unit/states/test_lxc.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ import salt.states.lxc as lxc import salt.utils.versions -@skipIf(NO_MOCK, NO_MOCK_REASON) class LxcTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.lxc diff --git a/tests/unit/states/test_makeconf.py b/tests/unit/states/test_makeconf.py index 76d28528d83..530207eb3f0 100644 --- a/tests/unit/states/test_makeconf.py +++ b/tests/unit/states/test_makeconf.py @@ -7,10 +7,8 @@ from __future__ import absolute_import # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.makeconf as makeconf -@skipIf(NO_MOCK, NO_MOCK_REASON) class MakeconfTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.makeconf diff --git a/tests/unit/states/test_mdadm_raid.py b/tests/unit/states/test_mdadm_raid.py index 70b94b127d1..f742c932f74 100644 --- a/tests/unit/states/test_mdadm_raid.py +++ b/tests/unit/states/test_mdadm_raid.py @@ -8,19 +8,16 @@ from __future__ import absolute_import # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.mdadm_raid as mdadm -@skipIf(NO_MOCK, NO_MOCK_REASON) class MdadmTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the mdadm state diff --git a/tests/unit/states/test_memcached.py b/tests/unit/states/test_memcached.py index cb69f9ee15a..d67402915ab 100644 --- a/tests/unit/states/test_memcached.py +++ b/tests/unit/states/test_memcached.py @@ -7,10 +7,8 @@ from __future__ import absolute_import # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -20,7 +18,6 @@ from salt.exceptions import CommandExecutionError import salt.states.memcached as memcached -@skipIf(NO_MOCK, NO_MOCK_REASON) class MemcachedTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.memcached diff --git a/tests/unit/states/test_modjk.py b/tests/unit/states/test_modjk.py index ce7c379dd76..5d063c99c6b 100644 --- a/tests/unit/states/test_modjk.py +++ b/tests/unit/states/test_modjk.py @@ -6,10 +6,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON) +from tests.support.unit import TestCase # Import Salt Libs import salt.states.modjk as modjk @@ -22,7 +19,6 @@ else: LIST_NOT_STR = "workers should be a list not a " -@skipIf(NO_MOCK, NO_MOCK_REASON) class ModjkTestCase(TestCase): ''' Test cases for salt.states.modjk diff --git a/tests/unit/states/test_modjk_worker.py b/tests/unit/states/test_modjk_worker.py index 5ac1c6a8e32..aacc806cfd1 100644 --- a/tests/unit/states/test_modjk_worker.py +++ b/tests/unit/states/test_modjk_worker.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.modjk_worker as modjk_worker -@skipIf(NO_MOCK, NO_MOCK_REASON) class ModjkWorkerTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.modjk_worker diff --git a/tests/unit/states/test_module.py b/tests/unit/states/test_module.py index b505e85b90c..0b7f51a2975 100644 --- a/tests/unit/states/test_module.py +++ b/tests/unit/states/test_module.py @@ -13,10 +13,8 @@ import salt.states.module as module # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -107,7 +105,6 @@ def _mocked_none_return(ret=None): return ret -@skipIf(NO_MOCK, NO_MOCK_REASON) class ModuleStateTest(TestCase, LoaderModuleMockMixin): ''' Tests module state (salt/states/module.py) diff --git a/tests/unit/states/test_mongodb_database.py b/tests/unit/states/test_mongodb_database.py index 5d64ba6a686..cf313bc4d43 100644 --- a/tests/unit/states/test_mongodb_database.py +++ b/tests/unit/states/test_mongodb_database.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.mongodb_database as mongodb_database -@skipIf(NO_MOCK, NO_MOCK_REASON) class MongodbDatabaseTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.mongodb_database diff --git a/tests/unit/states/test_mongodb_user.py b/tests/unit/states/test_mongodb_user.py index 12f9b249ad1..a0e76cdbcc4 100644 --- a/tests/unit/states/test_mongodb_user.py +++ b/tests/unit/states/test_mongodb_user.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.mongodb_user as mongodb_user -@skipIf(NO_MOCK, NO_MOCK_REASON) class MongodbUserTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.mongodb_user diff --git a/tests/unit/states/test_mount.py b/tests/unit/states/test_mount.py index 2b35626b826..5d57d62cca4 100644 --- a/tests/unit/states/test_mount.py +++ b/tests/unit/states/test_mount.py @@ -8,10 +8,8 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.mount as mount -@skipIf(NO_MOCK, NO_MOCK_REASON) class MountTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.mount diff --git a/tests/unit/states/test_mysql_grants.py b/tests/unit/states/test_mysql_grants.py index 12972dab7d3..3b30b8f42fe 100644 --- a/tests/unit/states/test_mysql_grants.py +++ b/tests/unit/states/test_mysql_grants.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.mysql_grants as mysql_grants -@skipIf(NO_MOCK, NO_MOCK_REASON) class MysqlGrantsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.mysql_grants diff --git a/tests/unit/states/test_mysql_query.py b/tests/unit/states/test_mysql_query.py index 5c32e4d1b69..95a7e00774a 100644 --- a/tests/unit/states/test_mysql_query.py +++ b/tests/unit/states/test_mysql_query.py @@ -8,10 +8,8 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.mysql_query as mysql_query -@skipIf(NO_MOCK, NO_MOCK_REASON) class MysqlQueryTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.mysql_query diff --git a/tests/unit/states/test_mysql_user.py b/tests/unit/states/test_mysql_user.py index 972d87cdbc3..c1797a343a4 100644 --- a/tests/unit/states/test_mysql_user.py +++ b/tests/unit/states/test_mysql_user.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -19,7 +17,6 @@ import salt.states.mysql_user as mysql_user import salt.utils.data -@skipIf(NO_MOCK, NO_MOCK_REASON) class MysqlUserTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.mysql_user diff --git a/tests/unit/states/test_net_napalm_yang.py b/tests/unit/states/test_net_napalm_yang.py index 40318977bb9..ea66ac9b97f 100644 --- a/tests/unit/states/test_net_napalm_yang.py +++ b/tests/unit/states/test_net_napalm_yang.py @@ -10,10 +10,8 @@ import salt.states.net_napalm_yang as netyang # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -23,7 +21,6 @@ TEST_DATA = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class NetyangTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): return {netyang: {}} diff --git a/tests/unit/states/test_network.py b/tests/unit/states/test_network.py index e086c5fb0f1..17da548b3b3 100644 --- a/tests/unit/states/test_network.py +++ b/tests/unit/states/test_network.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -53,7 +51,6 @@ class MockGrains(object): return {'A': 'B'} -@skipIf(NO_MOCK, NO_MOCK_REASON) class NetworkTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the network state diff --git a/tests/unit/states/test_nexus.py b/tests/unit/states/test_nexus.py index b3525d774a3..17299ecbc18 100644 --- a/tests/unit/states/test_nexus.py +++ b/tests/unit/states/test_nexus.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.nexus as nexus -@skipIf(NO_MOCK, NO_MOCK_REASON) class nexusTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.nexus diff --git a/tests/unit/states/test_nftables.py b/tests/unit/states/test_nftables.py index 5566292bbbd..d9767f2a923 100644 --- a/tests/unit/states/test_nftables.py +++ b/tests/unit/states/test_nftables.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.nftables as nftables -@skipIf(NO_MOCK, NO_MOCK_REASON) class NftablesTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the nftables state diff --git a/tests/unit/states/test_npm.py b/tests/unit/states/test_npm.py index 3bfb4bc4d8d..b51f8e070f5 100644 --- a/tests/unit/states/test_npm.py +++ b/tests/unit/states/test_npm.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -20,7 +18,6 @@ from salt.exceptions import CommandExecutionError import salt.states.npm as npm -@skipIf(NO_MOCK, NO_MOCK_REASON) class NpmTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/states/test_ntp.py b/tests/unit/states/test_ntp.py index 5c101109410..01133d04184 100644 --- a/tests/unit/states/test_ntp.py +++ b/tests/unit/states/test_ntp.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.ntp as ntp -@skipIf(NO_MOCK, NO_MOCK_REASON) class NtpTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ntp diff --git a/tests/unit/states/test_openstack_config.py b/tests/unit/states/test_openstack_config.py index 5ae0f83d621..7bd203be17d 100644 --- a/tests/unit/states/test_openstack_config.py +++ b/tests/unit/states/test_openstack_config.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -20,7 +18,6 @@ from salt.exceptions import CommandExecutionError import salt.states.openstack_config as openstack_config -@skipIf(NO_MOCK, NO_MOCK_REASON) class OpenstackConfigTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.openstack_config diff --git a/tests/unit/states/test_openvswitch_port.py b/tests/unit/states/test_openvswitch_port.py index 046b48ca964..8d603874c4f 100644 --- a/tests/unit/states/test_openvswitch_port.py +++ b/tests/unit/states/test_openvswitch_port.py @@ -4,18 +4,15 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - NO_MOCK, - NO_MOCK_REASON, patch) # Import Salt Libs import salt.states.openvswitch_port as openvswitch_port -@skipIf(NO_MOCK, NO_MOCK_REASON) class OpenvswitchPortTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.openvswitch_port diff --git a/tests/unit/states/test_pagerduty.py b/tests/unit/states/test_pagerduty.py index 18a16c9ab27..54e98ca7633 100644 --- a/tests/unit/states/test_pagerduty.py +++ b/tests/unit/states/test_pagerduty.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.pagerduty as pagerduty -@skipIf(NO_MOCK, NO_MOCK_REASON) class PagerdutyTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.pagerduty diff --git a/tests/unit/states/test_pecl.py b/tests/unit/states/test_pecl.py index 8f1dff940f2..e6d37b0c2f1 100644 --- a/tests/unit/states/test_pecl.py +++ b/tests/unit/states/test_pecl.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.pecl as pecl -@skipIf(NO_MOCK, NO_MOCK_REASON) class PeclTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.pecl diff --git a/tests/unit/states/test_pip_state.py b/tests/unit/states/test_pip_state.py index 08f31b8a73f..5efb70f8d7a 100644 --- a/tests/unit/states/test_pip_state.py +++ b/tests/unit/states/test_pip_state.py @@ -15,7 +15,7 @@ import sys # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin, SaltReturnAssertsMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch # Import salt libs import salt.states.pip_state as pip_state @@ -31,7 +31,6 @@ except ImportError: log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PIP, 'The \'pip\' library is not importable(installed system-wide)') class PipStateTest(TestCase, SaltReturnAssertsMixin, LoaderModuleMockMixin): diff --git a/tests/unit/states/test_pkg.py b/tests/unit/states/test_pkg.py index 42fe6c6867a..174ab65ab8e 100644 --- a/tests/unit/states/test_pkg.py +++ b/tests/unit/states/test_pkg.py @@ -5,10 +5,8 @@ from __future__ import absolute_import # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ import salt.states.pkg as pkg from salt.ext.six.moves import zip -@skipIf(NO_MOCK, NO_MOCK_REASON) class PkgTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.pkg diff --git a/tests/unit/states/test_pkgng.py b/tests/unit/states/test_pkgng.py index 25398ec2665..42d9101fcc0 100644 --- a/tests/unit/states/test_pkgng.py +++ b/tests/unit/states/test_pkgng.py @@ -7,10 +7,8 @@ from __future__ import absolute_import # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.pkgng as pkgng -@skipIf(NO_MOCK, NO_MOCK_REASON) class PkgngTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.pkgng diff --git a/tests/unit/states/test_portage_config.py b/tests/unit/states/test_portage_config.py index 1138939f4b5..2feb5cb5dfb 100644 --- a/tests/unit/states/test_portage_config.py +++ b/tests/unit/states/test_portage_config.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.portage_config as portage_config -@skipIf(NO_MOCK, NO_MOCK_REASON) class PortageConfigTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.portage_config diff --git a/tests/unit/states/test_ports.py b/tests/unit/states/test_ports.py index 3dbdfdbee4b..27130ceca82 100644 --- a/tests/unit/states/test_ports.py +++ b/tests/unit/states/test_ports.py @@ -8,10 +8,8 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -43,7 +41,6 @@ class MockSys(object): self.modules = {'A': MockContext()} -@skipIf(NO_MOCK, NO_MOCK_REASON) class PortsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ports diff --git a/tests/unit/states/test_postgres.py b/tests/unit/states/test_postgres.py index 8291d4cd204..e8b9793112c 100644 --- a/tests/unit/states/test_postgres.py +++ b/tests/unit/states/test_postgres.py @@ -5,8 +5,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import Mock, MagicMock, patch # Import salt libs import salt.modules.postgres as postgresmod @@ -17,7 +17,6 @@ import salt.states.postgres_extension as postgres_extension import salt.states.postgres_schema as postgres_schema -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresUserTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): @@ -164,7 +163,6 @@ class PostgresUserTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(self.salt_stub['postgres.user_update'].call_count, 0) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresGroupTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): @@ -309,7 +307,6 @@ class PostgresGroupTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(self.salt_stub['postgres.group_update'].call_count, 0) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresExtensionTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): @@ -498,7 +495,6 @@ class PostgresExtensionTestCase(TestCase, LoaderModuleMockMixin): ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresSchemaTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/states/test_postgres_cluster.py b/tests/unit/states/test_postgres_cluster.py index 9bf6b3b1e2e..632c00db0af 100644 --- a/tests/unit/states/test_postgres_cluster.py +++ b/tests/unit/states/test_postgres_cluster.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.postgres_cluster as postgres_cluster -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresClusterTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.postgres_cluster diff --git a/tests/unit/states/test_postgres_database.py b/tests/unit/states/test_postgres_database.py index 7688787c89f..b24fd73b5e0 100644 --- a/tests/unit/states/test_postgres_database.py +++ b/tests/unit/states/test_postgres_database.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.postgres_database as postgres_database -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresDatabaseTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.postgres_database diff --git a/tests/unit/states/test_postgres_extension.py b/tests/unit/states/test_postgres_extension.py index f8bb340ece3..5f454f76624 100644 --- a/tests/unit/states/test_postgres_extension.py +++ b/tests/unit/states/test_postgres_extension.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.postgres_extension as postgres_extension -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresExtensionTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.postgres_extension diff --git a/tests/unit/states/test_postgres_group.py b/tests/unit/states/test_postgres_group.py index 8948c01a211..95a66239b27 100644 --- a/tests/unit/states/test_postgres_group.py +++ b/tests/unit/states/test_postgres_group.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.postgres_group as postgres_group -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresGroupTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.postgres_group diff --git a/tests/unit/states/test_postgres_initdb.py b/tests/unit/states/test_postgres_initdb.py index 9c8088ad03e..42b825682e5 100644 --- a/tests/unit/states/test_postgres_initdb.py +++ b/tests/unit/states/test_postgres_initdb.py @@ -5,10 +5,8 @@ from __future__ import absolute_import, unicode_literals, print_function from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -16,7 +14,6 @@ from tests.support.mock import ( import salt.states.postgres_initdb as postgres_initdb -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresInitdbTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.postgres_initdb diff --git a/tests/unit/states/test_postgres_language.py b/tests/unit/states/test_postgres_language.py index 7a269f9afd1..843ad921e10 100644 --- a/tests/unit/states/test_postgres_language.py +++ b/tests/unit/states/test_postgres_language.py @@ -5,10 +5,8 @@ from __future__ import absolute_import, unicode_literals, print_function from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -16,7 +14,6 @@ from tests.support.mock import ( import salt.states.postgres_language as postgres_language -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresLanguageTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.postgres_language diff --git a/tests/unit/states/test_postgres_privileges.py b/tests/unit/states/test_postgres_privileges.py index ab2dd2d1ab9..372ffed20db 100644 --- a/tests/unit/states/test_postgres_privileges.py +++ b/tests/unit/states/test_postgres_privileges.py @@ -5,10 +5,8 @@ from __future__ import absolute_import, unicode_literals, print_function from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -16,7 +14,6 @@ from tests.support.mock import ( import salt.states.postgres_privileges as postgres_privileges -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresPrivilegesTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.postgres_privileges diff --git a/tests/unit/states/test_postgres_schema.py b/tests/unit/states/test_postgres_schema.py index 082135d1517..8e6b1a38903 100644 --- a/tests/unit/states/test_postgres_schema.py +++ b/tests/unit/states/test_postgres_schema.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.postgres_schema as postgres_schema -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresSchemaTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.postgres_schema diff --git a/tests/unit/states/test_postgres_user.py b/tests/unit/states/test_postgres_user.py index 75b6525b287..3c636ac4c55 100644 --- a/tests/unit/states/test_postgres_user.py +++ b/tests/unit/states/test_postgres_user.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.postgres_user as postgres_user -@skipIf(NO_MOCK, NO_MOCK_REASON) class PostgresUserTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.postgres_user diff --git a/tests/unit/states/test_powerpath.py b/tests/unit/states/test_powerpath.py index 4f253fe3bd7..584041a866e 100644 --- a/tests/unit/states/test_powerpath.py +++ b/tests/unit/states/test_powerpath.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.powerpath as powerpath -@skipIf(NO_MOCK, NO_MOCK_REASON) class PowerpathTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.powerpath diff --git a/tests/unit/states/test_process.py b/tests/unit/states/test_process.py index f46005e22a2..326dfd627ee 100644 --- a/tests/unit/states/test_process.py +++ b/tests/unit/states/test_process.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.process as process -@skipIf(NO_MOCK, NO_MOCK_REASON) class ProcessTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.process diff --git a/tests/unit/states/test_proxy.py b/tests/unit/states/test_proxy.py index f21e0506437..3ef1484889d 100644 --- a/tests/unit/states/test_proxy.py +++ b/tests/unit/states/test_proxy.py @@ -5,10 +5,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch, call @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.proxy as proxy -@skipIf(NO_MOCK, NO_MOCK_REASON) class ProxyTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the proxy state diff --git a/tests/unit/states/test_pyenv.py b/tests/unit/states/test_pyenv.py index 67248bcdcee..e6392fe4aaf 100644 --- a/tests/unit/states/test_pyenv.py +++ b/tests/unit/states/test_pyenv.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.pyenv as pyenv -@skipIf(NO_MOCK, NO_MOCK_REASON) class PyenvTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.pyenv diff --git a/tests/unit/states/test_pyrax_queues.py b/tests/unit/states/test_pyrax_queues.py index ede7ee218fb..c39664686fe 100644 --- a/tests/unit/states/test_pyrax_queues.py +++ b/tests/unit/states/test_pyrax_queues.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.pyrax_queues as pyrax_queues -@skipIf(NO_MOCK, NO_MOCK_REASON) class PyraxQueuesTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.pyrax_queues diff --git a/tests/unit/states/test_quota.py b/tests/unit/states/test_quota.py index 9e30d2d6f0b..4362adcd6fd 100644 --- a/tests/unit/states/test_quota.py +++ b/tests/unit/states/test_quota.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.quota as quota -@skipIf(NO_MOCK, NO_MOCK_REASON) class QuotaTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.quota diff --git a/tests/unit/states/test_rabbitmq_cluster.py b/tests/unit/states/test_rabbitmq_cluster.py index 98e4047aa05..51a5bb1bf56 100644 --- a/tests/unit/states/test_rabbitmq_cluster.py +++ b/tests/unit/states/test_rabbitmq_cluster.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.rabbitmq_cluster as rabbitmq_cluster -@skipIf(NO_MOCK, NO_MOCK_REASON) class RabbitmqClusterTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the rabbitmq_cluster state diff --git a/tests/unit/states/test_rabbitmq_plugin.py b/tests/unit/states/test_rabbitmq_plugin.py index 7a3a9a5ae88..6590788b715 100644 --- a/tests/unit/states/test_rabbitmq_plugin.py +++ b/tests/unit/states/test_rabbitmq_plugin.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.rabbitmq_plugin as rabbitmq_plugin -@skipIf(NO_MOCK, NO_MOCK_REASON) class RabbitmqPluginTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.rabbitmq_plugin diff --git a/tests/unit/states/test_rabbitmq_policy.py b/tests/unit/states/test_rabbitmq_policy.py index 9707b5ceb47..9209e77a4a3 100644 --- a/tests/unit/states/test_rabbitmq_policy.py +++ b/tests/unit/states/test_rabbitmq_policy.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.rabbitmq_policy as rabbitmq_policy -@skipIf(NO_MOCK, NO_MOCK_REASON) class RabbitmqPolicyTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.rabbitmq_policy diff --git a/tests/unit/states/test_rabbitmq_vhost.py b/tests/unit/states/test_rabbitmq_vhost.py index 550f4a0846e..70854cce7ef 100644 --- a/tests/unit/states/test_rabbitmq_vhost.py +++ b/tests/unit/states/test_rabbitmq_vhost.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.rabbitmq_vhost as rabbitmq_vhost -@skipIf(NO_MOCK, NO_MOCK_REASON) class RabbitmqVhostTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.rabbitmq_vhost diff --git a/tests/unit/states/test_rbenv.py b/tests/unit/states/test_rbenv.py index 03cfb06165f..a8b1833a350 100644 --- a/tests/unit/states/test_rbenv.py +++ b/tests/unit/states/test_rbenv.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.rbenv as rbenv -@skipIf(NO_MOCK, NO_MOCK_REASON) class RbenvTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.rbenv diff --git a/tests/unit/states/test_rdp.py b/tests/unit/states/test_rdp.py index 66005706765..248cfb67093 100644 --- a/tests/unit/states/test_rdp.py +++ b/tests/unit/states/test_rdp.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.rdp as rdp -@skipIf(NO_MOCK, NO_MOCK_REASON) class RdpTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.rdp diff --git a/tests/unit/states/test_redismod.py b/tests/unit/states/test_redismod.py index 5e8cac62332..e417e2de26b 100644 --- a/tests/unit/states/test_redismod.py +++ b/tests/unit/states/test_redismod.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.redismod as redismod -@skipIf(NO_MOCK, NO_MOCK_REASON) class RedismodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.redismod diff --git a/tests/unit/states/test_rsync.py b/tests/unit/states/test_rsync.py index e2e6c9e4da1..cecebfc37c6 100644 --- a/tests/unit/states/test_rsync.py +++ b/tests/unit/states/test_rsync.py @@ -10,16 +10,13 @@ import salt.states.rsync as rsync # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class RsyncTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the Rsync state diff --git a/tests/unit/states/test_rvm.py b/tests/unit/states/test_rvm.py index 30e0cab9721..1acad27db14 100644 --- a/tests/unit/states/test_rvm.py +++ b/tests/unit/states/test_rvm.py @@ -5,8 +5,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.states.rvm as rvm @@ -15,7 +15,6 @@ import salt.states.rvm as rvm from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestRvmState(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/states/test_saltmod.py b/tests/unit/states/test_saltmod.py index acfe13d9a58..1519aefa225 100644 --- a/tests/unit/states/test_saltmod.py +++ b/tests/unit/states/test_saltmod.py @@ -11,10 +11,8 @@ import tempfile # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -27,7 +25,6 @@ import salt.utils.event import salt.states.saltmod as saltmod -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltmodTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.saltmod @@ -299,7 +296,6 @@ class SaltmodTestCase(TestCase, LoaderModuleMockMixin): assert cmd_kwargs['roster'] == 'my_roster' -@skipIf(NO_MOCK, NO_MOCK_REASON) class StatemodTests(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): self.tmp_cachedir = tempfile.mkdtemp(dir=RUNTIME_VARS.TMP) diff --git a/tests/unit/states/test_saltutil.py b/tests/unit/states/test_saltutil.py index 598f18734eb..1f7eb062cf8 100644 --- a/tests/unit/states/test_saltutil.py +++ b/tests/unit/states/test_saltutil.py @@ -9,10 +9,8 @@ import inspect # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -22,7 +20,6 @@ import salt.states.saltutil as saltutil_state import salt.modules.saltutil as saltutil_module -@skipIf(NO_MOCK, NO_MOCK_REASON) class Saltutil(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.saltutil diff --git a/tests/unit/states/test_schedule.py b/tests/unit/states/test_schedule.py index 156e0db3f17..79e6ba3c72d 100644 --- a/tests/unit/states/test_schedule.py +++ b/tests/unit/states/test_schedule.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.schedule as schedule -@skipIf(NO_MOCK, NO_MOCK_REASON) class ScheduleTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.schedule diff --git a/tests/unit/states/test_selinux.py b/tests/unit/states/test_selinux.py index 04b47f6b213..4040815ad90 100644 --- a/tests/unit/states/test_selinux.py +++ b/tests/unit/states/test_selinux.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.selinux as selinux -@skipIf(NO_MOCK, NO_MOCK_REASON) class SelinuxTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.selinux diff --git a/tests/unit/states/test_serverdensity_device.py b/tests/unit/states/test_serverdensity_device.py index d75d77ef716..6e54931548b 100644 --- a/tests/unit/states/test_serverdensity_device.py +++ b/tests/unit/states/test_serverdensity_device.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.serverdensity_device as serverdensity_device -@skipIf(NO_MOCK, NO_MOCK_REASON) class ServerdensityDeviceTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.serverdensity_device diff --git a/tests/unit/states/test_service.py b/tests/unit/states/test_service.py index 9699f1e246f..2677c056011 100644 --- a/tests/unit/states/test_service.py +++ b/tests/unit/states/test_service.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -27,7 +25,6 @@ def func(name): return name -@skipIf(NO_MOCK, NO_MOCK_REASON) class ServiceTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the service state diff --git a/tests/unit/states/test_slack.py b/tests/unit/states/test_slack.py index 0e87db2539e..81677538fb3 100644 --- a/tests/unit/states/test_slack.py +++ b/tests/unit/states/test_slack.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.slack as slack -@skipIf(NO_MOCK, NO_MOCK_REASON) class SlackTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.slack diff --git a/tests/unit/states/test_smtp.py b/tests/unit/states/test_smtp.py index d05c6d665cc..9dd8693ed8a 100644 --- a/tests/unit/states/test_smtp.py +++ b/tests/unit/states/test_smtp.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.smtp as smtp -@skipIf(NO_MOCK, NO_MOCK_REASON) class SmtpTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.smtp diff --git a/tests/unit/states/test_splunk_search.py b/tests/unit/states/test_splunk_search.py index 62a5a596155..7e4824f3dc8 100644 --- a/tests/unit/states/test_splunk_search.py +++ b/tests/unit/states/test_splunk_search.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.splunk_search as splunk_search -@skipIf(NO_MOCK, NO_MOCK_REASON) class SplunkSearchTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.splunk_search diff --git a/tests/unit/states/test_ssh_auth.py b/tests/unit/states/test_ssh_auth.py index 2d3bb084783..3039daaa3df 100644 --- a/tests/unit/states/test_ssh_auth.py +++ b/tests/unit/states/test_ssh_auth.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.ssh_auth as ssh_auth -@skipIf(NO_MOCK, NO_MOCK_REASON) class SshAuthTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ssh_auth diff --git a/tests/unit/states/test_ssh_known_hosts.py b/tests/unit/states/test_ssh_known_hosts.py index 2fa555c2fbf..a8a9a709915 100644 --- a/tests/unit/states/test_ssh_known_hosts.py +++ b/tests/unit/states/test_ssh_known_hosts.py @@ -8,10 +8,8 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -20,7 +18,6 @@ from tests.support.mock import ( import salt.states.ssh_known_hosts as ssh_known_hosts -@skipIf(NO_MOCK, NO_MOCK_REASON) class SshKnownHostsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.ssh_known_hosts diff --git a/tests/unit/states/test_status.py b/tests/unit/states/test_status.py index f82e964b93e..fa0c67bbc30 100644 --- a/tests/unit/states/test_status.py +++ b/tests/unit/states/test_status.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.status as status -@skipIf(NO_MOCK, NO_MOCK_REASON) class StatusTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.status diff --git a/tests/unit/states/test_supervisord.py b/tests/unit/states/test_supervisord.py index 5720e3d7e34..5b363b3ead4 100644 --- a/tests/unit/states/test_supervisord.py +++ b/tests/unit/states/test_supervisord.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -19,7 +17,6 @@ from tests.support.mock import ( import salt.states.supervisord as supervisord -@skipIf(NO_MOCK, NO_MOCK_REASON) class SupervisordTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.supervisord diff --git a/tests/unit/states/test_svn.py b/tests/unit/states/test_svn.py index d80855667b2..9ebd22e2d74 100644 --- a/tests/unit/states/test_svn.py +++ b/tests/unit/states/test_svn.py @@ -11,16 +11,13 @@ import salt.states.svn as svn # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SvnTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the svn state diff --git a/tests/unit/states/test_sysctl.py b/tests/unit/states/test_sysctl.py index 15e8e3c3cf9..1bf55191763 100644 --- a/tests/unit/states/test_sysctl.py +++ b/tests/unit/states/test_sysctl.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) @@ -21,7 +19,6 @@ from salt.exceptions import CommandExecutionError import salt.states.sysctl as sysctl -@skipIf(NO_MOCK, NO_MOCK_REASON) class SysctlTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.sysctl diff --git a/tests/unit/states/test_syslog_ng.py b/tests/unit/states/test_syslog_ng.py index 1dcd4086f6a..929f4353032 100644 --- a/tests/unit/states/test_syslog_ng.py +++ b/tests/unit/states/test_syslog_ng.py @@ -10,8 +10,8 @@ import re import tempfile from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch import salt.utils.files import salt.utils.yaml @@ -295,7 +295,6 @@ def remove_whitespaces(source): return re.sub(r"\s+", "", source.strip()) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SyslogNGTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): return { diff --git a/tests/unit/states/test_sysrc.py b/tests/unit/states/test_sysrc.py index 946d624c25f..957023d6e68 100644 --- a/tests/unit/states/test_sysrc.py +++ b/tests/unit/states/test_sysrc.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.sysrc as sysrc -@skipIf(NO_MOCK, NO_MOCK_REASON) class SysrcTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the sysrc state diff --git a/tests/unit/states/test_test.py b/tests/unit/states/test_test.py index 5392c62bda6..411b3936034 100644 --- a/tests/unit/states/test_test.py +++ b/tests/unit/states/test_test.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( patch, MagicMock, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -23,7 +21,6 @@ from salt.utils.odict import OrderedDict from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the test state diff --git a/tests/unit/states/test_timezone.py b/tests/unit/states/test_timezone.py index 0d5d3eaa66b..53d327a6147 100644 --- a/tests/unit/states/test_timezone.py +++ b/tests/unit/states/test_timezone.py @@ -8,12 +8,10 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -21,7 +19,6 @@ from salt.exceptions import CommandExecutionError import salt.states.timezone as timezone -@skipIf(NO_MOCK, NO_MOCK_REASON) class TimezoneTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the timezone state diff --git a/tests/unit/states/test_tomcat.py b/tests/unit/states/test_tomcat.py index d3b5b9aaa35..9c2e84566b1 100644 --- a/tests/unit/states/test_tomcat.py +++ b/tests/unit/states/test_tomcat.py @@ -12,16 +12,13 @@ from salt.modules import tomcat as tomcatmod # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class TomcatTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the tomcat state diff --git a/tests/unit/states/test_user.py b/tests/unit/states/test_user.py index 4b7a3d8149b..43d1454b9b0 100644 --- a/tests/unit/states/test_user.py +++ b/tests/unit/states/test_user.py @@ -9,13 +9,11 @@ import logging # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( Mock, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -24,7 +22,6 @@ import salt.states.user as user log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class UserTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the user state diff --git a/tests/unit/states/test_vbox_guest.py b/tests/unit/states/test_vbox_guest.py index e9831442960..594518a7de6 100644 --- a/tests/unit/states/test_vbox_guest.py +++ b/tests/unit/states/test_vbox_guest.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.vbox_guest as vbox_guest -@skipIf(NO_MOCK, NO_MOCK_REASON) class VboxGuestTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the vbox_guest state diff --git a/tests/unit/states/test_virt.py b/tests/unit/states/test_virt.py index 133325ac559..fab202ab4aa 100644 --- a/tests/unit/states/test_virt.py +++ b/tests/unit/states/test_virt.py @@ -10,10 +10,8 @@ import shutil # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, mock_open, patch) @@ -42,7 +40,6 @@ class LibvirtMock(MagicMock): # pylint: disable=too-many-ancestors return six.text_type(self) -@skipIf(NO_MOCK, NO_MOCK_REASON) class LibvirtTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.libvirt diff --git a/tests/unit/states/test_virtualenv_mod.py b/tests/unit/states/test_virtualenv_mod.py index e0721c1565f..20472714f3e 100644 --- a/tests/unit/states/test_virtualenv_mod.py +++ b/tests/unit/states/test_virtualenv_mod.py @@ -9,19 +9,16 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.virtualenv_mod as virtualenv_mod -@skipIf(NO_MOCK, NO_MOCK_REASON) class VirtualenvModTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the virtualenv_mod state diff --git a/tests/unit/states/test_webutil.py b/tests/unit/states/test_webutil.py index 5e9af220483..1b0d1ccca80 100644 --- a/tests/unit/states/test_webutil.py +++ b/tests/unit/states/test_webutil.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.webutil as htpasswd -@skipIf(NO_MOCK, NO_MOCK_REASON) class HtpasswdTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.webutil diff --git a/tests/unit/states/test_win_dns_client.py b/tests/unit/states/test_win_dns_client.py index a8552c04677..20d22cd30f1 100644 --- a/tests/unit/states/test_win_dns_client.py +++ b/tests/unit/states/test_win_dns_client.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.win_dns_client as win_dns_client -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinDnsClientTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the win_dns_client state diff --git a/tests/unit/states/test_win_iis.py b/tests/unit/states/test_win_iis.py index 3f27a4e1225..ab3c74f4a91 100644 --- a/tests/unit/states/test_win_iis.py +++ b/tests/unit/states/test_win_iis.py @@ -13,16 +13,13 @@ import salt.states.win_iis as win_iis # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, - patch, - NO_MOCK, - NO_MOCK_REASON, + patch ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinIisTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.win_pki diff --git a/tests/unit/states/test_win_network.py b/tests/unit/states/test_win_network.py index a7cf0b21d2e..03a047ecb32 100644 --- a/tests/unit/states/test_win_network.py +++ b/tests/unit/states/test_win_network.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.win_network as win_network -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinNetworkTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the nftables state diff --git a/tests/unit/states/test_win_path.py b/tests/unit/states/test_win_path.py index 6f32fb422bd..027af1e7cdb 100644 --- a/tests/unit/states/test_win_path.py +++ b/tests/unit/states/test_win_path.py @@ -9,13 +9,11 @@ import copy # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( Mock, MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -24,7 +22,6 @@ import salt.states.win_path as win_path NAME = 'salt' -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinPathTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the win_path state diff --git a/tests/unit/states/test_win_pki.py b/tests/unit/states/test_win_pki.py index ea07bbd2356..de0b996eb39 100644 --- a/tests/unit/states/test_win_pki.py +++ b/tests/unit/states/test_win_pki.py @@ -14,12 +14,10 @@ import salt.states.win_pki as win_pki # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, ) CERT_PATH = r'C:\certs\testdomain.local.cer' @@ -37,7 +35,6 @@ CERTS = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinPkiTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.win_pki diff --git a/tests/unit/states/test_win_powercfg.py b/tests/unit/states/test_win_powercfg.py index 41e409a46f3..083a2c61876 100644 --- a/tests/unit/states/test_win_powercfg.py +++ b/tests/unit/states/test_win_powercfg.py @@ -8,16 +8,13 @@ import salt.states.win_powercfg as powercfg # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PowerCfgTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the powercfg state diff --git a/tests/unit/states/test_win_servermanager.py b/tests/unit/states/test_win_servermanager.py index 77fb3c1a0f3..c14b03fc99a 100644 --- a/tests/unit/states/test_win_servermanager.py +++ b/tests/unit/states/test_win_servermanager.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.win_servermanager as win_servermanager -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinServermanagerTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the win_servermanager state diff --git a/tests/unit/states/test_win_snmp.py b/tests/unit/states/test_win_snmp.py index f2f69d802b1..a62d12eeeed 100644 --- a/tests/unit/states/test_win_snmp.py +++ b/tests/unit/states/test_win_snmp.py @@ -15,16 +15,13 @@ from salt.ext import six # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinSnmpTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.win_snmp diff --git a/tests/unit/states/test_win_system.py b/tests/unit/states/test_win_system.py index f18ea32baa6..83561858131 100644 --- a/tests/unit/states/test_win_system.py +++ b/tests/unit/states/test_win_system.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.win_system as win_system -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinSystemTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the win_system state diff --git a/tests/unit/states/test_winrepo.py b/tests/unit/states/test_winrepo.py index 16796c901a6..7495d7c8911 100644 --- a/tests/unit/states/test_winrepo.py +++ b/tests/unit/states/test_winrepo.py @@ -9,12 +9,10 @@ import os # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -51,7 +49,6 @@ class MockRunnerClient(object): return [] -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinrepoTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the winrepo state diff --git a/tests/unit/states/test_xmpp.py b/tests/unit/states/test_xmpp.py index ee33587a359..1c7bab91ec3 100644 --- a/tests/unit/states/test_xmpp.py +++ b/tests/unit/states/test_xmpp.py @@ -8,19 +8,16 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs import salt.states.xmpp as xmpp -@skipIf(NO_MOCK, NO_MOCK_REASON) class XmppTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the xmpp state diff --git a/tests/unit/states/test_zabbix_action.py b/tests/unit/states/test_zabbix_action.py index 757b6ba5885..31e0dc62097 100644 --- a/tests/unit/states/test_zabbix_action.py +++ b/tests/unit/states/test_zabbix_action.py @@ -9,12 +9,10 @@ from __future__ import unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) import salt.states.zabbix_action as zabbix_action @@ -70,7 +68,6 @@ DIFF_PARAMS = {'filter': {'evaltype': '2', 'actionid': '28'} -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZabbixActionTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.zabbix diff --git a/tests/unit/states/test_zabbix_template.py b/tests/unit/states/test_zabbix_template.py index 27112db52e1..f95918f9fd2 100644 --- a/tests/unit/states/test_zabbix_template.py +++ b/tests/unit/states/test_zabbix_template.py @@ -9,12 +9,10 @@ from __future__ import unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) import salt.states.zabbix_template as zabbix_template @@ -49,7 +47,6 @@ SUBSTITUTE_PARAMS_UPDATE = [DEFINED_OBJ, EXISTING_OBJ_DIFF[0], [], [], [], [], [ DIFF_PARAMS = {'old': {}, 'new': {'macros': [], 'templateid': '10206'}} -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZabbixTemplateTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.zabbix diff --git a/tests/unit/states/test_zabbix_valuemap.py b/tests/unit/states/test_zabbix_valuemap.py index fe0d7207f08..58652ab1ec1 100644 --- a/tests/unit/states/test_zabbix_valuemap.py +++ b/tests/unit/states/test_zabbix_valuemap.py @@ -9,12 +9,10 @@ from __future__ import unicode_literals # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) import salt.states.zabbix_valuemap as zabbix_valuemap @@ -34,7 +32,6 @@ DIFF_PARAMS = {'valuemapid': '21', 'mappings': [{'newvalue': 'OK', 'value': '0h' {'newvalue': 'Failure', 'value': '1'}]} -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZabbixActionTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.zabbix diff --git a/tests/unit/states/test_zfs.py b/tests/unit/states/test_zfs.py index 0d673958c8b..6504bebb19a 100644 --- a/tests/unit/states/test_zfs.py +++ b/tests/unit/states/test_zfs.py @@ -14,10 +14,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.zfs import ZFSMockData from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -30,7 +28,6 @@ import salt.loader from salt.utils.odict import OrderedDict -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZfsTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.zfs diff --git a/tests/unit/states/test_zk_concurrency.py b/tests/unit/states/test_zk_concurrency.py index 278320b541d..0572e7e1c90 100644 --- a/tests/unit/states/test_zk_concurrency.py +++ b/tests/unit/states/test_zk_concurrency.py @@ -7,10 +7,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -18,7 +16,6 @@ from tests.support.mock import ( import salt.states.zk_concurrency as zk_concurrency -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZkConcurrencyTestCase(TestCase, LoaderModuleMockMixin): ''' Validate the zk_concurrency state diff --git a/tests/unit/states/test_zpool.py b/tests/unit/states/test_zpool.py index d41ced75010..52cc544d100 100644 --- a/tests/unit/states/test_zpool.py +++ b/tests/unit/states/test_zpool.py @@ -14,10 +14,8 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.zfs import ZFSMockData from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -30,7 +28,6 @@ import salt.loader from salt.utils.odict import OrderedDict -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZpoolTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.states.zpool diff --git a/tests/unit/test_auth.py b/tests/unit/test_auth.py index 54c3915144d..11d34f73be1 100644 --- a/tests/unit/test_auth.py +++ b/tests/unit/test_auth.py @@ -10,7 +10,7 @@ import time # Import Salt Testing libs from tests.support.unit import TestCase, skipIf -from tests.support.mock import patch, call, NO_MOCK, NO_MOCK_REASON, MagicMock +from tests.support.mock import patch, call, MagicMock # Import Salt libraries import salt.master @@ -20,7 +20,6 @@ from salt.exceptions import SaltDeserializationError import salt.utils.platform -@skipIf(NO_MOCK, NO_MOCK_REASON) class LoadAuthTestCase(TestCase): def setUp(self): # pylint: disable=W0221 diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py index 620aeeb50b8..c6ec5ee2dd1 100644 --- a/tests/unit/test_client.py +++ b/tests/unit/test_client.py @@ -8,7 +8,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs from tests.support.mixins import SaltClientTestCaseMixin -from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import patch from tests.support.unit import TestCase, skipIf # Import Salt libs @@ -19,7 +19,6 @@ from salt.exceptions import ( ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class LocalClientTestCase(TestCase, SaltClientTestCaseMixin): diff --git a/tests/unit/test_cloud.py b/tests/unit/test_cloud.py index 6b004c113f2..cbf01181003 100644 --- a/tests/unit/test_cloud.py +++ b/tests/unit/test_cloud.py @@ -8,14 +8,9 @@ from __future__ import absolute_import import os # Import Salt Testing libs +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch from tests.support.runtests import RUNTIME_VARS -from tests.support.unit import skipIf, TestCase -from tests.support.mock import ( - MagicMock, - patch, - NO_MOCK, - NO_MOCK_REASON, -) # Import Salt libs import salt.cloud @@ -104,7 +99,6 @@ EXAMPLE_MAP = { } -@skipIf(NO_MOCK, NO_MOCK_REASON) class MapConfTest(TestCase): ''' Validate evaluation of salt-cloud map configuration diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py index d3c78ce0b60..3bc42624dd7 100644 --- a/tests/unit/test_config.py +++ b/tests/unit/test_config.py @@ -15,8 +15,6 @@ from tests.support.mixins import AdaptedConfigurationTestCaseMixin from tests.support.unit import skipIf, TestCase from tests.support.runtests import RUNTIME_VARS from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, Mock, MagicMock, patch @@ -890,7 +888,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): # cloud_config tests - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_cloud_config_double_master_path(self): ''' Tests passing in master_config_path and master_config kwargs. @@ -899,7 +896,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertRaises(SaltCloudConfigError, salt.config.cloud_config, PATH, master_config_path='foo', master_config='bar') - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_cloud_config_double_providers_path(self): ''' Tests passing in providers_config_path and providers_config kwargs. @@ -908,7 +904,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertRaises(SaltCloudConfigError, salt.config.cloud_config, PATH, providers_config_path='foo', providers_config='bar') - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_cloud_config_double_profiles_path(self): ''' Tests passing in profiles_config_path and profiles_config kwargs. @@ -917,7 +912,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertRaises(SaltCloudConfigError, salt.config.cloud_config, PATH, profiles_config_path='foo', profiles_config='bar') - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_cloud_config_providers_in_opts(self): ''' Tests mixing old cloud providers with pre-configured providers configurations @@ -929,7 +923,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertRaises(SaltCloudConfigError, salt.config.cloud_config, PATH, providers_config='bar') - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_cloud_config_providers_in_opts_path(self): ''' Tests mixing old cloud providers with pre-configured providers configurations @@ -942,7 +935,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertRaises(SaltCloudConfigError, salt.config.cloud_config, PATH, providers_config_path='bar') - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_cloud_config_deploy_scripts_search_path(self): ''' Tests the contents of the 'deploy_scripts_search_path' tuple to ensure that @@ -986,7 +978,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertRaises(SaltCloudConfigError, salt.config.apply_cloud_config, overrides, defaults=DEFAULT) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_apply_cloud_config_success_list(self): ''' Tests success when valid data is passed into the function as a list @@ -1002,7 +993,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): 'providers': {'foo': {'bar': {'driver': 'foo:bar'}}}} self.assertEqual(salt.config.apply_cloud_config(overrides, defaults=DEFAULT), ret) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_apply_cloud_config_success_dict(self): ''' Tests success when valid data is passed into function as a dictionary @@ -1454,7 +1444,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): # <---- Salt Cloud Configuration Tests --------------------------------------------- - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_include_config_without_errors(self): ''' Tests that include_config function returns valid configuration @@ -1469,7 +1458,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertEqual(config_opts, configuration) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_include_config_with_errors(self): ''' Tests that include_config function returns valid configuration even on errors @@ -1484,7 +1472,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertEqual(config_opts, configuration) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_include_config_with_errors_exit(self): ''' Tests that include_config exits on errors @@ -1522,7 +1509,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): ret.update(kwargs) return ret - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_apply_config(self): ''' Ensure that the environment and saltenv options work properly @@ -1590,7 +1576,6 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertEqual(ret['saltenv'], 'foo') -@skipIf(NO_MOCK, NO_MOCK_REASON) class APIConfigTestCase(DefaultConfigsBase, TestCase): ''' TestCase for the api_config function in salt.config.__init__.py diff --git a/tests/unit/test_crypt.py b/tests/unit/test_crypt.py index 56d50b79b28..abf0e39aa93 100644 --- a/tests/unit/test_crypt.py +++ b/tests/unit/test_crypt.py @@ -11,8 +11,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, mock_open, - NO_MOCK, - NO_MOCK_REASON, MagicMock, MockCall, ) @@ -98,7 +96,6 @@ SIG = ( b'\x14H\xb2\xc4>\xc3A\xed\x86x~\xcfU\xd5Q\xfe~\x10\xd2\x9b') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYCRYPTO_RSA, 'pycrypto >= 2.6 is not available') @skipIf(HAS_M2, 'm2crypto is used by salt.crypt if installed') class CryptTestCase(TestCase): @@ -160,7 +157,6 @@ class CryptTestCase(TestCase): self.assertTrue(crypt.verify_signature('/keydir/keyname.pub', MSG, SIG)) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_M2, 'm2crypto is not available') class M2CryptTestCase(TestCase): @patch('os.umask', MagicMock()) diff --git a/tests/unit/test_fileclient.py b/tests/unit/test_fileclient.py index 94a3c3d4acb..ecc9ed40f1c 100644 --- a/tests/unit/test_fileclient.py +++ b/tests/unit/test_fileclient.py @@ -12,8 +12,8 @@ import shutil # Import Salt Testing libs from tests.support.mixins import AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin -from tests.support.mock import patch, Mock, MagicMock, NO_MOCK, NO_MOCK_REASON -from tests.support.unit import TestCase, skipIf +from tests.support.mock import patch, Mock, MagicMock +from tests.support.unit import TestCase from tests.support.runtests import RUNTIME_VARS # Import Salt libs @@ -82,7 +82,6 @@ def _get_file_roots(fs_root): ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class FileClientTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin): def setup_loader_modules(self): @@ -126,7 +125,6 @@ class FileClientTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMo self.assertEqual('remote_client', ret) -@skipIf(NO_MOCK, NO_MOCK_REASON) class FileclientCacheTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin): ''' Tests for the fileclient caching. The LocalClient is the only thing we can diff --git a/tests/unit/test_minion.py b/tests/unit/test_minion.py index c98cd207c06..5b5c84b16f7 100644 --- a/tests/unit/test_minion.py +++ b/tests/unit/test_minion.py @@ -9,8 +9,8 @@ import copy import os # Import Salt Testing libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import patch, MagicMock from tests.support.mixins import AdaptedConfigurationTestCaseMixin from tests.support.helpers import skip_if_not_root # Import salt libs @@ -23,7 +23,6 @@ import tornado.testing from salt.ext.six.moves import range -@skipIf(NO_MOCK, NO_MOCK_REASON) class MinionTestCase(TestCase, AdaptedConfigurationTestCaseMixin): def setUp(self): @@ -341,7 +340,6 @@ class MinionTestCase(TestCase, AdaptedConfigurationTestCaseMixin): minion.destroy() -@skipIf(NO_MOCK, NO_MOCK_REASON) class MinionAsyncTestCase(TestCase, AdaptedConfigurationTestCaseMixin, tornado.testing.AsyncTestCase): def setUp(self): diff --git a/tests/unit/test_mock.py b/tests/unit/test_mock.py index 96c86599b7e..90cf041d5eb 100644 --- a/tests/unit/test_mock.py +++ b/tests/unit/test_mock.py @@ -15,8 +15,8 @@ import salt.utils.stringutils from salt.ext import six # Import Salt Testing Libs -from tests.support.mock import patch, mock_open, NO_MOCK, NO_MOCK_REASON -from tests.support.unit import TestCase, skipIf +from tests.support.mock import patch, mock_open +from tests.support.unit import TestCase log = logging.getLogger(__name__) @@ -285,7 +285,6 @@ class MockOpenMixin(object): pass -@skipIf(NO_MOCK, NO_MOCK_REASON) class MockOpenTestCase(TestCase, MockOpenMixin): ''' Tests for our mock_open helper to ensure that it behaves as closely as diff --git a/tests/unit/test_payload.py b/tests/unit/test_payload.py index 463835d4a6f..98b323475e6 100644 --- a/tests/unit/test_payload.py +++ b/tests/unit/test_payload.py @@ -16,7 +16,6 @@ import datetime # Import Salt Testing libs from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON # Import Salt libs from salt.utils import immutabletypes @@ -33,7 +32,6 @@ import logging log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PayloadTestCase(TestCase): def assertNoOrderedDict(self, data): diff --git a/tests/unit/test_pillar.py b/tests/unit/test_pillar.py index 6562958c6d7..4db02132a19 100644 --- a/tests/unit/test_pillar.py +++ b/tests/unit/test_pillar.py @@ -15,8 +15,8 @@ import tempfile # Import Salt Testing libs from tests.support.runtests import RUNTIME_VARS from tests.support.helpers import with_tempdir -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.fileclient @@ -46,7 +46,6 @@ class MockFileclient(object): # pylint: enable=unused-argument,no-method-argument,method-hidden -@skipIf(NO_MOCK, NO_MOCK_REASON) class PillarTestCase(TestCase): def tearDown(self): @@ -820,7 +819,6 @@ sub_with_slashes: } -@skipIf(NO_MOCK, NO_MOCK_REASON) @patch('salt.transport.client.ReqChannel.factory', MagicMock()) class RemotePillarTestCase(TestCase): ''' @@ -938,7 +936,6 @@ class RemotePillarTestCase(TestCase): dictkey='pillar') -@skipIf(NO_MOCK, NO_MOCK_REASON) @patch('salt.transport.client.AsyncReqChannel.factory', MagicMock()) class AsyncRemotePillarTestCase(TestCase): ''' diff --git a/tests/unit/test_proxy_minion.py b/tests/unit/test_proxy_minion.py index 67e00091e7c..c676a807fd6 100644 --- a/tests/unit/test_proxy_minion.py +++ b/tests/unit/test_proxy_minion.py @@ -12,8 +12,7 @@ import tornado import tornado.testing # Import Salt Testing libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase from tests.support.mixins import AdaptedConfigurationTestCaseMixin # Import salt libs @@ -25,7 +24,6 @@ log = logging.getLogger(__name__) __opts__ = {} -@skipIf(NO_MOCK, NO_MOCK_REASON) class ProxyMinionTestCase(TestCase, AdaptedConfigurationTestCaseMixin): def test_post_master_init_metaproxy_called(self): ''' diff --git a/tests/unit/test_state.py b/tests/unit/test_state.py index 719fcfd115d..d5814d70e01 100644 --- a/tests/unit/test_state.py +++ b/tests/unit/test_state.py @@ -12,8 +12,6 @@ import tempfile # Import Salt Testing libs from tests.support.unit import TestCase, skipIf from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) from tests.support.mixins import AdaptedConfigurationTestCaseMixin @@ -31,7 +29,6 @@ except ImportError as err: pytest = None -@skipIf(NO_MOCK, NO_MOCK_REASON) class StateCompilerTestCase(TestCase, AdaptedConfigurationTestCaseMixin): ''' TestCase for the state compiler. @@ -171,7 +168,6 @@ class HighStateTestCase(TestCase, AdaptedConfigurationTestCaseMixin): self.assertEqual(ret, [('somestuff', 'cmd')]) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(pytest is None, 'PyTest is missing') class StateReturnsTestCase(TestCase): ''' diff --git a/tests/unit/test_template.py b/tests/unit/test_template.py index 97c7f533ee4..dea646c7035 100644 --- a/tests/unit/test_template.py +++ b/tests/unit/test_template.py @@ -7,8 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals # Import Salt Testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock +from tests.support.unit import TestCase +from tests.support.mock import MagicMock # Import Salt libs from salt import template @@ -28,7 +28,6 @@ class TemplateTestCase(TestCase): ret = template.compile_template(['1', '2', '3'], None, None, None, None) self.assertDictEqual(ret, {}) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_compile_template_preserves_windows_newlines(self): ''' Test to ensure that a file with Windows newlines, when rendered by a diff --git a/tests/unit/test_zypp_plugins.py b/tests/unit/test_zypp_plugins.py index a18f0484892..86c89c6c503 100644 --- a/tests/unit/test_zypp_plugins.py +++ b/tests/unit/test_zypp_plugins.py @@ -7,12 +7,10 @@ from __future__ import absolute_import # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) import os @@ -31,7 +29,6 @@ ZYPPNOTIFY_FILE = os.path.sep.join( ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZyppPluginsTestCase(TestCase): ''' Test shipped libzypp plugins. diff --git a/tests/unit/tokens/test_localfs.py b/tests/unit/tokens/test_localfs.py index 45ed8a93521..ac5113f013f 100644 --- a/tests/unit/tokens/test_localfs.py +++ b/tests/unit/tokens/test_localfs.py @@ -10,9 +10,9 @@ import salt.exceptions import salt.tokens.localfs import salt.utils.files -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.helpers import with_tempdir -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import patch class CalledWith(object): @@ -29,7 +29,6 @@ class CalledWith(object): return self.func(*args, **kwargs) -@skipIf(NO_MOCK, NO_MOCK_REASON) class WriteTokenTest(TestCase): @with_tempdir() diff --git a/tests/unit/tops/test_ext_nodes.py b/tests/unit/tops/test_ext_nodes.py index e74c87a5ca7..3acef0aa7dd 100644 --- a/tests/unit/tops/test_ext_nodes.py +++ b/tests/unit/tops/test_ext_nodes.py @@ -9,16 +9,15 @@ import subprocess import textwrap # Import Salt Testing libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mixins import LoaderModuleMockMixin -from tests.support.mock import patch, MagicMock, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import patch, MagicMock # Import Salt libs import salt.utils.stringutils import salt.tops.ext_nodes as ext_nodes -@skipIf(NO_MOCK, NO_MOCK_REASON) class ExtNodesTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): return { diff --git a/tests/unit/utils/test_args.py b/tests/unit/utils/test_args.py index e4f110db3ed..b68a37854af 100644 --- a/tests/unit/utils/test_args.py +++ b/tests/unit/utils/test_args.py @@ -11,11 +11,9 @@ from salt.ext import six import salt.utils.args # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( DEFAULT, - NO_MOCK, - NO_MOCK_REASON, patch ) @@ -65,7 +63,6 @@ class ArgsTestCase(TestCase): ret = salt.utils.args.arg_lookup(dummy_func) self.assertEqual(expected_dict, ret) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_format_call(self): with patch('salt.utils.args.arg_lookup') as arg_lookup: def dummy_func(first=None, second=None, third=None): @@ -120,7 +117,6 @@ class ArgsTestCase(TestCase): r'foo2 takes at least 2 arguments \(1 given\)'): salt.utils.args.format_call(foo2, dict(one=1)) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_argspec_report(self): def _test_spec(arg1, arg2, kwarg1=None): pass diff --git a/tests/unit/utils/test_botomod.py b/tests/unit/utils/test_botomod.py index e18d80f5879..7cd080e5b51 100644 --- a/tests/unit/utils/test_botomod.py +++ b/tests/unit/utils/test_botomod.py @@ -7,7 +7,7 @@ import os # Import Salt Testing libs from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.mock import patch, MagicMock from tests.support.runtests import RUNTIME_VARS # Import Salt libs @@ -168,7 +168,6 @@ class BotoUtilsCacheIdTestCase(BotoUtilsTestCaseBase): self.assertEqual(cache_id(resource_name), resource_id) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(HAS_BOTO is False, 'The boto module must be installed.') @skipIf(HAS_MOTO is False, 'The moto module must be installed.') @skipIf(_has_required_boto() is False, 'The boto module must be greater than' diff --git a/tests/unit/utils/test_cache.py b/tests/unit/utils/test_cache.py index 26636d2607f..598dd63ef78 100644 --- a/tests/unit/utils/test_cache.py +++ b/tests/unit/utils/test_cache.py @@ -14,8 +14,7 @@ import tempfile import shutil # Import Salt Testing libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase # Import salt libs import salt.config @@ -103,7 +102,6 @@ __context__ = {'a': 'b'} __opts__ = {'cachedir': '/tmp'} -@skipIf(NO_MOCK, NO_MOCK_REASON) class ContextCacheTest(TestCase): ''' Test case for salt.utils.cache.ContextCache diff --git a/tests/unit/utils/test_data.py b/tests/unit/utils/test_data.py index c4184a940a3..892ef029c18 100644 --- a/tests/unit/utils/test_data.py +++ b/tests/unit/utils/test_data.py @@ -11,8 +11,8 @@ import logging import salt.utils.data import salt.utils.stringutils from salt.utils.odict import OrderedDict -from tests.support.unit import TestCase, skipIf, LOREM_IPSUM -from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase, LOREM_IPSUM +from tests.support.mock import patch from salt.ext.six.moves import builtins # pylint: disable=import-error,redefined-builtin from salt.ext import six @@ -442,7 +442,6 @@ class DataTestCase(TestCase): keep=False, to_str=True) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_decode_fallback(self): ''' Test fallback to utf-8 @@ -587,7 +586,6 @@ class DataTestCase(TestCase): keep=False, preserve_tuples=True) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_encode_fallback(self): ''' Test fallback to utf-8 diff --git a/tests/unit/utils/test_dateutils.py b/tests/unit/utils/test_dateutils.py index 1f750b1968f..af23927ceaa 100644 --- a/tests/unit/utils/test_dateutils.py +++ b/tests/unit/utils/test_dateutils.py @@ -11,8 +11,6 @@ import datetime from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt libs @@ -28,7 +26,6 @@ except ImportError: class DateutilsTestCase(TestCase): - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_date_cast(self): now = datetime.datetime.now() with patch('datetime.datetime'): diff --git a/tests/unit/utils/test_decorators.py b/tests/unit/utils/test_decorators.py index ceb1167508f..9a0f20c8d9a 100644 --- a/tests/unit/utils/test_decorators.py +++ b/tests/unit/utils/test_decorators.py @@ -11,8 +11,8 @@ from __future__ import absolute_import, print_function, unicode_literals import salt.utils.decorators as decorators from salt.version import SaltStackVersion from salt.exceptions import CommandExecutionError, SaltConfigurationError -from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.unit import TestCase +from tests.support.mock import patch class DummyLogger(object): @@ -29,7 +29,6 @@ class DummyLogger(object): self._messages.append(msg) -@skipIf(NO_MOCK, NO_MOCK_REASON) class DecoratorsTest(TestCase): ''' Testing decorators. diff --git a/tests/unit/utils/test_dns.py b/tests/unit/utils/test_dns.py index b7c46446e53..7608cfbcdbe 100644 --- a/tests/unit/utils/test_dns.py +++ b/tests/unit/utils/test_dns.py @@ -20,7 +20,7 @@ import salt.modules.cmdmod # Testing from tests.support.unit import skipIf, TestCase -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch +from tests.support.mock import MagicMock, patch class DNShelpersCase(TestCase): @@ -153,7 +153,6 @@ class DNShelpersCase(TestCase): self.assertEqual(group, res) -@skipIf(NO_MOCK, NO_MOCK_REASON) class DNSlookupsCase(TestCase): ''' Test the lookup result parsers diff --git a/tests/unit/utils/test_etcd_util.py b/tests/unit/utils/test_etcd_util.py index ce7f58b97f6..90ad3618211 100644 --- a/tests/unit/utils/test_etcd_util.py +++ b/tests/unit/utils/test_etcd_util.py @@ -11,8 +11,6 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -32,7 +30,6 @@ except ImportError: @skipIf(HAS_URLLIB3 is False, 'urllib3 module must be installed.') @skipIf(HAS_ETCD is False, 'python-etcd module must be installed.') -@skipIf(NO_MOCK, NO_MOCK_REASON) class EtcdUtilTestCase(TestCase): ''' Test cases for salt.utils.etcd_util diff --git a/tests/unit/utils/test_files.py b/tests/unit/utils/test_files.py index 5e8cc7625f6..095a21e009d 100644 --- a/tests/unit/utils/test_files.py +++ b/tests/unit/utils/test_files.py @@ -17,8 +17,6 @@ from tests.support.helpers import with_tempdir from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) @@ -27,7 +25,6 @@ class FilesTestCase(TestCase): Test case for files util. ''' - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_safe_rm(self): with patch('os.remove') as os_remove_mock: salt.utils.files.safe_rm('dummy_tgt') diff --git a/tests/unit/utils/test_gitfs.py b/tests/unit/utils/test_gitfs.py index a9ed6f8f147..7c1686f4f45 100644 --- a/tests/unit/utils/test_gitfs.py +++ b/tests/unit/utils/test_gitfs.py @@ -8,8 +8,8 @@ any remotes. from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing libs -from tests.support.unit import skipIf, TestCase -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch # Import salt libs import salt.utils.gitfs @@ -19,7 +19,6 @@ from salt.exceptions import FileserverConfigError OPTS = {'cachedir': '/tmp/gitfs-test-cache'} -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestGitFSProvider(TestCase): def test_provider_case_insensitive(self): diff --git a/tests/unit/utils/test_http.py b/tests/unit/utils/test_http.py index d64147dbc0b..861457f2e93 100644 --- a/tests/unit/utils/test_http.py +++ b/tests/unit/utils/test_http.py @@ -9,18 +9,13 @@ import socket from contextlib import closing # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON -from tests.support.helpers import ( - MirrorPostHandler, - Webserver -) +from tests.support.unit import TestCase +from tests.support.helpers import MirrorPostHandler, Webserver # Import Salt Libs import salt.utils.http as http -@skipIf(NO_MOCK, NO_MOCK_REASON) class HTTPTestCase(TestCase): ''' Unit TestCase for the salt.utils.http module. diff --git a/tests/unit/utils/test_jid.py b/tests/unit/utils/test_jid.py index 246c516a8cb..3bb5d2baa6d 100644 --- a/tests/unit/utils/test_jid.py +++ b/tests/unit/utils/test_jid.py @@ -10,12 +10,8 @@ import os # Import Salt libs import salt.utils.jid -from tests.support.unit import TestCase, skipIf -from tests.support.mock import ( - patch, - NO_MOCK, - NO_MOCK_REASON -) +from tests.support.unit import TestCase +from tests.support.mock import patch class JidTestCase(TestCase): @@ -33,7 +29,6 @@ class JidTestCase(TestCase): self.assertFalse(salt.utils.jid.is_jid(20131219110700123489)) # int self.assertFalse(salt.utils.jid.is_jid('2013121911070012348911111')) # Wrong length - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_gen_jid(self): now = datetime.datetime(2002, 12, 25, 12, 0, 0, 0) with patch('salt.utils.jid._utc_now', return_value=now): @@ -45,14 +40,12 @@ class JidTestCase(TestCase): ret = salt.utils.jid.gen_jid({'unique_jid': True}) self.assertEqual(ret, '20021225120000000001_{0}'.format(os.getpid())) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_gen_jid_utc(self): utcnow = datetime.datetime(2002, 12, 25, 12, 7, 0, 0) with patch('salt.utils.jid._utc_now', return_value=utcnow): ret = salt.utils.jid.gen_jid({'utc_jid': True}) self.assertEqual(ret, '20021225120700000000') - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_gen_jid_utc_unique(self): utcnow = datetime.datetime(2002, 12, 25, 12, 7, 0, 0) with patch('salt.utils.jid._utc_now', return_value=utcnow): diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py index 6ad1ee47069..fbbac4755c3 100644 --- a/tests/unit/utils/test_jinja.py +++ b/tests/unit/utils/test_jinja.py @@ -18,7 +18,7 @@ from tests.support.runtests import RUNTIME_VARS from tests.support.unit import skipIf, TestCase from tests.support.case import ModuleCase from tests.support.helpers import flaky -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock, Mock +from tests.support.mock import patch, MagicMock, Mock # Import Salt libs import salt.config @@ -534,7 +534,6 @@ class TestGetTemplate(TestCase): ) @skipIf(six.PY3, 'Not applicable to Python 3') - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_render_with_unicode_syntax_error(self): with patch.object(builtins, '__salt_system_encoding__', 'utf-8'): template = 'hello\n\n{{ bad\n\nfoo한' @@ -547,7 +546,6 @@ class TestGetTemplate(TestCase): dict(opts=self.local_opts, saltenv='test', salt=self.local_salt) ) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_render_with_utf8_syntax_error(self): with patch.object(builtins, '__salt_system_encoding__', 'utf-8'): template = 'hello\n\n{{ bad\n\nfoo한' diff --git a/tests/unit/utils/test_json.py b/tests/unit/utils/test_json.py index 4c3e49a0d14..7bb428a110a 100644 --- a/tests/unit/utils/test_json.py +++ b/tests/unit/utils/test_json.py @@ -8,7 +8,7 @@ import textwrap # Import Salt Testing libs from tests.support.helpers import with_tempfile -from tests.support.mock import patch, MagicMock, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import patch, MagicMock from tests.support.unit import TestCase, LOREM_IPSUM, skipIf # Import Salt libs @@ -97,7 +97,6 @@ class JSONTestCase(TestCase): @skipIf(salt.utils.platform.is_windows(), 'skip until we figure out what to do about decoding unicode on windows') @skipIf(not six.PY2, 'Test only needed on Python 2') - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_find_json_unicode_splitlines(self): ''' Tests a case in salt-ssh where a unicode string is split into a list of diff --git a/tests/unit/utils/test_locales.py b/tests/unit/utils/test_locales.py index 7045b8b2bfd..627e3162b01 100644 --- a/tests/unit/utils/test_locales.py +++ b/tests/unit/utils/test_locales.py @@ -6,14 +6,13 @@ from __future__ import absolute_import, unicode_literals # Import Salt libs import salt.utils.locales as locales -from tests.support.unit import TestCase, skipIf -from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import patch # Import 3rd-part libs from salt.ext.six.moves import reload_module -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestLocales(TestCase): def test_get_encodings(self): # reload locales modules before and after to defeat memoization of diff --git a/tests/unit/utils/test_mac_utils.py b/tests/unit/utils/test_mac_utils.py index f6c5894027a..955999512d9 100644 --- a/tests/unit/utils/test_mac_utils.py +++ b/tests/unit/utils/test_mac_utils.py @@ -15,8 +15,6 @@ from tests.support.mock import ( call, MagicMock, mock_open, - NO_MOCK, - NO_MOCK_REASON, patch ) from tests.support.mixins import LoaderModuleMockMixin @@ -31,7 +29,6 @@ from salt.ext.six.moves import range from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.utils.platform.is_darwin(), 'These tests run only on mac') class MacUtilsTestCase(TestCase, LoaderModuleMockMixin): ''' diff --git a/tests/unit/utils/test_network.py b/tests/unit/utils/test_network.py index 6a940300b84..67463cdfe82 100644 --- a/tests/unit/utils/test_network.py +++ b/tests/unit/utils/test_network.py @@ -6,15 +6,12 @@ import socket import textwrap # Import Salt Testing libs -from tests.support.unit import skipIf from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, mock_open, create_autospec, patch, - NO_MOCK, - NO_MOCK_REASON, ) # Import salt libs @@ -134,7 +131,6 @@ IPV6_SUBNETS = {True: ('::1/128',), False: ('::1', '::1/129', 'FOO', 9, 'aj01::feac/64')} -@skipIf(NO_MOCK, NO_MOCK_REASON) class NetworkTestCase(TestCase): def test_sanitize_host(self): diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py index 45c34a0937f..2e8662c5bbf 100644 --- a/tests/unit/utils/test_parsers.py +++ b/tests/unit/utils/test_parsers.py @@ -14,8 +14,6 @@ from tests.support.runtests import RUNTIME_VARS from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import Salt Libs @@ -558,7 +556,6 @@ class ParserBase(object): self.assertDictEqual(nums_1, nums_2) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(salt.utils.platform.is_windows(), 'Windows uses a logging listener') class MasterOptionParserTestCase(ParserBase, TestCase): ''' @@ -589,7 +586,6 @@ class MasterOptionParserTestCase(ParserBase, TestCase): os.unlink(self.log_file) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(salt.utils.platform.is_windows(), 'Windows uses a logging listener') class MinionOptionParserTestCase(ParserBase, TestCase): ''' @@ -620,7 +616,6 @@ class MinionOptionParserTestCase(ParserBase, TestCase): os.unlink(self.log_file) -@skipIf(NO_MOCK, NO_MOCK_REASON) class ProxyMinionOptionParserTestCase(ParserBase, TestCase): ''' Tests parsing Salt Proxy Minion options @@ -651,7 +646,6 @@ class ProxyMinionOptionParserTestCase(ParserBase, TestCase): os.unlink(self.log_file) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(salt.utils.platform.is_windows(), 'Windows uses a logging listener') class SyndicOptionParserTestCase(ParserBase, TestCase): ''' @@ -688,7 +682,6 @@ class SyndicOptionParserTestCase(ParserBase, TestCase): os.unlink(self.syndic_log_file) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltCMDOptionParserTestCase(ParserBase, TestCase): ''' Tests parsing Salt CLI options @@ -721,7 +714,6 @@ class SaltCMDOptionParserTestCase(ParserBase, TestCase): os.unlink(self.log_file) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltCPOptionParserTestCase(ParserBase, TestCase): ''' Tests parsing salt-cp options @@ -754,7 +746,6 @@ class SaltCPOptionParserTestCase(ParserBase, TestCase): os.unlink(self.log_file) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltKeyOptionParserTestCase(ParserBase, TestCase): ''' Tests parsing salt-key options @@ -877,7 +868,6 @@ class SaltKeyOptionParserTestCase(ParserBase, TestCase): os.unlink(self.key_logfile) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltCallOptionParserTestCase(ParserBase, TestCase): ''' Tests parsing Salt Minion options @@ -910,7 +900,6 @@ class SaltCallOptionParserTestCase(ParserBase, TestCase): os.unlink(self.log_file) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltRunOptionParserTestCase(ParserBase, TestCase): ''' Tests parsing Salt Master options @@ -943,7 +932,6 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): os.unlink(self.log_file) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltSSHOptionParserTestCase(ParserBase, TestCase): ''' Tests parsing Salt Master options @@ -982,7 +970,6 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): os.unlink(self.ssh_log_file) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltCloudParserTestCase(ParserBase, TestCase): ''' Tests parsing Salt Cloud options @@ -1019,7 +1006,6 @@ class SaltCloudParserTestCase(ParserBase, TestCase): os.unlink(self.log_file) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SPMParserTestCase(ParserBase, TestCase): ''' Tests parsing Salt Cloud options @@ -1059,7 +1045,6 @@ class SPMParserTestCase(ParserBase, TestCase): os.unlink(self.spm_logfile) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SaltAPIParserTestCase(ParserBase, TestCase): ''' Tests parsing Salt Cloud options @@ -1100,7 +1085,6 @@ class SaltAPIParserTestCase(ParserBase, TestCase): @skipIf(not pytest, False) -@skipIf(NO_MOCK, NO_MOCK_REASON) class DaemonMixInTestCase(TestCase): ''' Tests the PIDfile deletion in the DaemonMixIn. diff --git a/tests/unit/utils/test_path.py b/tests/unit/utils/test_path.py index a693492cc87..52de6295de8 100644 --- a/tests/unit/utils/test_path.py +++ b/tests/unit/utils/test_path.py @@ -14,7 +14,7 @@ import tempfile # Import Salt Testing libs from tests.support.unit import TestCase, skipIf -from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import patch # Import Salt libs import salt.utils.compat @@ -137,7 +137,6 @@ class PathJoinTestCase(TestCase): salt.utils.compat.reload(module) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PathTestCase(TestCase): def test_which_bin(self): ret = salt.utils.path.which_bin('str') @@ -160,14 +159,12 @@ class PathTestCase(TestCase): self.assertEqual(salt.utils.path.sanitize_win_path('\\windows\\system'), '\\windows\\system') self.assertEqual(salt.utils.path.sanitize_win_path('\\bo:g|us\\p?at*h>'), '\\bo_g_us\\p_at_h_') - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_check_or_die(self): self.assertRaises(CommandNotFoundError, salt.utils.path.check_or_die, None) with patch('salt.utils.path.which', return_value=False): self.assertRaises(CommandNotFoundError, salt.utils.path.check_or_die, 'FAKE COMMAND') - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_join(self): with patch('salt.utils.platform.is_windows', return_value=False) as is_windows_mock: self.assertFalse(is_windows_mock.return_value) @@ -176,7 +173,6 @@ class PathTestCase(TestCase): self.assertEqual(ret, expected_path) -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestWhich(TestCase): ''' Tests salt.utils.path.which function to ensure that it returns True as diff --git a/tests/unit/utils/test_pbm.py b/tests/unit/utils/test_pbm.py index f154e287557..a291307fd86 100644 --- a/tests/unit/utils/test_pbm.py +++ b/tests/unit/utils/test_pbm.py @@ -11,7 +11,7 @@ import logging # Import Salt testing libraries from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock, \ +from tests.support.mock import patch, MagicMock, \ PropertyMock # Import Salt libraries @@ -31,7 +31,6 @@ except ImportError: log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetProfileManagerTestCase(TestCase): '''Tests for salt.utils.pbm.get_profile_manager''' @@ -106,7 +105,6 @@ class GetProfileManagerTestCase(TestCase): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetPlacementSolverTestCase(TestCase): '''Tests for salt.utils.pbm.get_placement_solver''' @@ -181,7 +179,6 @@ class GetPlacementSolverTestCase(TestCase): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetCapabilityDefinitionsTestCase(TestCase): '''Tests for salt.utils.pbm.get_capability_definitions''' @@ -252,7 +249,6 @@ class GetCapabilityDefinitionsTestCase(TestCase): 'fake_cap_meta3']) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetPoliciesByIdTestCase(TestCase): '''Tests for salt.utils.pbm.get_policies_by_id''' @@ -302,7 +298,6 @@ class GetPoliciesByIdTestCase(TestCase): self.assertEqual(ret, self.mock_policies) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetStoragePoliciesTestCase(TestCase): '''Tests for salt.utils.pbm.get_storage_policies''' @@ -392,7 +387,6 @@ class GetStoragePoliciesTestCase(TestCase): self.assertEqual(ret, [self.mock_policies[1], self.mock_policies[3]]) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class CreateStoragePolicyTestCase(TestCase): '''Tests for salt.utils.pbm.create_storage_policy''' @@ -440,7 +434,6 @@ class CreateStoragePolicyTestCase(TestCase): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class UpdateStoragePolicyTestCase(TestCase): '''Tests for salt.utils.pbm.update_storage_policy''' @@ -489,7 +482,6 @@ class UpdateStoragePolicyTestCase(TestCase): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetDefaultStoragePolicyOfDatastoreTestCase(TestCase): '''Tests for salt.utils.pbm.get_default_storage_policy_of_datastore''' @@ -592,7 +584,6 @@ class GetDefaultStoragePolicyOfDatastoreTestCase(TestCase): self.assertEqual(ret, self.mock_policy_refs[0]) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class AssignDefaultStoragePolicyToDatastoreTestCase(TestCase): '''Tests for salt.utils.pbm.assign_default_storage_policy_to_datastore''' diff --git a/tests/unit/utils/test_pkg.py b/tests/unit/utils/test_pkg.py index c254cbb915b..e8b19bef141 100644 --- a/tests/unit/utils/test_pkg.py +++ b/tests/unit/utils/test_pkg.py @@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals, print_function -from tests.support.unit import TestCase, skipIf -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import MagicMock, patch import salt.utils.pkg from salt.utils.pkg import rpm @@ -47,7 +47,6 @@ class PkgUtilsTestCase(TestCase): self.assertEqual(test_parameter[2], verstr) -@skipIf(NO_MOCK, NO_MOCK_REASON) class PkgRPMTestCase(TestCase): ''' Test case for pkg.rpm utils diff --git a/tests/unit/utils/test_process.py b/tests/unit/utils/test_process.py index a87d4c68340..99345a53fb9 100644 --- a/tests/unit/utils/test_process.py +++ b/tests/unit/utils/test_process.py @@ -17,8 +17,6 @@ import warnings from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import salt libs @@ -226,7 +224,6 @@ class TestThreadPool(TestCase): class TestProcess(TestCase): - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_daemonize_if(self): # pylint: disable=assignment-from-none with patch('sys.argv', ['salt-call']): @@ -253,7 +250,6 @@ class TestProcessCallbacks(TestCase): def process_target(evt): evt.set() - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_callbacks(self): 'Validate Process call after fork and finalize methods' teardown_to_mock = 'salt.log.setup.shutdown_multiprocessing_logging' @@ -266,7 +262,6 @@ class TestProcessCallbacks(TestCase): mb.assert_called() ma.assert_called() - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_callbacks_called_when_run_overriden(self): 'Validate Process sub classes call after fork and finalize methods when run is overridden' @@ -303,7 +298,6 @@ class TestSignalHandlingProcess(TestCase): def children(cls, *args, **kwargs): raise psutil.NoSuchProcess(1) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_process_does_not_exist(self): try: with patch('psutil.Process', self.Process): @@ -312,7 +306,6 @@ class TestSignalHandlingProcess(TestCase): except psutil.NoSuchProcess: assert False, "psutil.NoSuchProcess raised" - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_process_children_do_not_exist(self): try: with patch('psutil.Process.children', self.children): @@ -433,7 +426,6 @@ class TestSignalHandlingProcessCallbacks(TestCase): def process_target(evt): evt.set() - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_callbacks(self): 'Validate SignalHandlingProcess call after fork and finalize methods' @@ -453,7 +445,6 @@ class TestSignalHandlingProcessCallbacks(TestCase): ma.assert_called() mb.assert_called() - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_callbacks_called_when_run_overriden(self): 'Validate SignalHandlingProcess sub classes call after fork and finalize methods when run is overridden' diff --git a/tests/unit/utils/test_reactor.py b/tests/unit/utils/test_reactor.py index a33d16942e0..dc7b5c791f4 100644 --- a/tests/unit/utils/test_reactor.py +++ b/tests/unit/utils/test_reactor.py @@ -13,11 +13,9 @@ import salt.utils.files import salt.utils.reactor as reactor import salt.utils.yaml -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mixins import AdaptedConfigurationTestCaseMixin from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, patch, MagicMock, Mock, @@ -380,7 +378,6 @@ WRAPPER_CALLS = { log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestReactor(TestCase, AdaptedConfigurationTestCaseMixin): ''' Tests for constructing the low chunks to be executed via the Reactor @@ -462,7 +459,6 @@ class TestReactor(TestCase, AdaptedConfigurationTestCaseMixin): self.assertEqual(reactions, LOW_CHUNKS[tag]) -@skipIf(NO_MOCK, NO_MOCK_REASON) class TestReactWrap(TestCase, AdaptedConfigurationTestCaseMixin): ''' Tests that we are formulating the wrapper calls properly diff --git a/tests/unit/utils/test_sanitizers.py b/tests/unit/utils/test_sanitizers.py index 51f2219c31b..90f4b1de95f 100644 --- a/tests/unit/utils/test_sanitizers.py +++ b/tests/unit/utils/test_sanitizers.py @@ -8,11 +8,9 @@ from salt.ext.six import text_type as text from salt.utils.sanitizers import clean, mask_args_value # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase -@skipIf(NO_MOCK, NO_MOCK_REASON) class SanitizersTestCase(TestCase): ''' TestCase for sanitizers diff --git a/tests/unit/utils/test_schedule.py b/tests/unit/utils/test_schedule.py index 904b46bbb1d..f5daf23c2b5 100644 --- a/tests/unit/utils/test_schedule.py +++ b/tests/unit/utils/test_schedule.py @@ -12,7 +12,7 @@ import os # Import Salt Testing Libs from tests.support.unit import skipIf, TestCase -from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import MagicMock, patch from tests.support.runtests import RUNTIME_VARS # Import Salt Libs @@ -29,8 +29,8 @@ except ImportError: log = logging.getLogger(__name__) + # pylint: disable=too-many-public-methods,invalid-name -@skipIf(NO_MOCK, NO_MOCK_REASON) class ScheduleTestCase(TestCase): ''' Unit tests for salt.utils.schedule module diff --git a/tests/unit/utils/test_sdb.py b/tests/unit/utils/test_sdb.py index dd3f9907825..5d2242d2ee1 100644 --- a/tests/unit/utils/test_sdb.py +++ b/tests/unit/utils/test_sdb.py @@ -10,17 +10,12 @@ import os # Import Salt Testing Libs from tests.support.runtests import RUNTIME_VARS from tests.support.mixins import LoaderModuleMockMixin -from tests.support.unit import TestCase, skipIf -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON -) +from tests.support.unit import TestCase # Import Salt Libs import salt.utils.sdb as sdb -@skipIf(NO_MOCK, NO_MOCK_REASON) class SdbTestCase(TestCase, LoaderModuleMockMixin): ''' Test cases for salt.modules.sdb diff --git a/tests/unit/utils/test_ssdp.py b/tests/unit/utils/test_ssdp.py index 0d028dbf140..d73caa2fa8f 100644 --- a/tests/unit/utils/test_ssdp.py +++ b/tests/unit/utils/test_ssdp.py @@ -7,8 +7,6 @@ import datetime from tests.support.unit import TestCase, skipIf from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -71,7 +69,6 @@ class Mocks(object): return factory -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(pytest is None, 'PyTest is missing') class SSDPBaseTestCase(TestCase, Mocks): ''' @@ -149,7 +146,6 @@ class SSDPBaseTestCase(TestCase, Mocks): assert base.get_self_ip() == expected_ip -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(pytest is None, 'PyTest is missing') class SSDPFactoryTestCase(TestCase, Mocks): ''' @@ -340,7 +336,6 @@ class SSDPFactoryTestCase(TestCase, Mocks): assert 'Received "%s" from %s:%s' in factory.log.debug.call_args[0][0] -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(pytest is None, 'PyTest is missing') class SSDPServerTestCase(TestCase, Mocks): ''' @@ -401,7 +396,6 @@ class SSDPServerTestCase(TestCase, Mocks): assert not cfg_port == ssdp.SSDPBase.DEFAULTS[ssdp.SSDPBase.PORT] and cfg_port == 12345 -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(pytest is None, 'PyTest is missing') class SSDPClientTestCase(TestCase, Mocks): ''' diff --git a/tests/unit/utils/test_systemd.py b/tests/unit/utils/test_systemd.py index bddfee5e546..9361e76cf77 100644 --- a/tests/unit/utils/test_systemd.py +++ b/tests/unit/utils/test_systemd.py @@ -6,8 +6,8 @@ import errno import os # Import Salt Testing libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import Mock, patch, NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase +from tests.support.mock import Mock, patch # Import Salt libs import salt.utils.systemd as _systemd @@ -24,7 +24,6 @@ def _not_booted_effect(path): return os.stat(path) -@skipIf(NO_MOCK, NO_MOCK_REASON) class SystemdTestCase(TestCase): ''' Tests the functions in salt.utils.systemd diff --git a/tests/unit/utils/test_thin.py b/tests/unit/utils/test_thin.py index e060414b3f3..45b34ece741 100644 --- a/tests/unit/utils/test_thin.py +++ b/tests/unit/utils/test_thin.py @@ -9,8 +9,6 @@ import sys from tests.support.unit import TestCase, skipIf from tests.support.helpers import TstSuiteLoggingHandler from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, MagicMock, patch) @@ -29,7 +27,6 @@ except ImportError: pytest = None -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(pytest is None, 'PyTest is missing') class SSHThinTestCase(TestCase): ''' diff --git a/tests/unit/utils/test_url.py b/tests/unit/utils/test_url.py index f39a00c5da6..e12adeac936 100644 --- a/tests/unit/utils/test_url.py +++ b/tests/unit/utils/test_url.py @@ -8,16 +8,13 @@ import salt.utils.platform import salt.utils.url # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) -@skipIf(NO_MOCK, NO_MOCK_REASON) class UrlTestCase(TestCase): ''' TestCase for salt.utils.url module diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py index b20f4410b7c..a90c4192b4b 100644 --- a/tests/unit/utils/test_verify.py +++ b/tests/unit/utils/test_verify.py @@ -29,8 +29,6 @@ from tests.support.helpers import ( from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON ) # Import salt libs @@ -261,7 +259,6 @@ class TestVerify(TestCase): resource.setrlimit(resource.RLIMIT_NOFILE, (mof_s, mof_h)) shutil.rmtree(tempdir) - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_verify_log(self): ''' Test that verify_log works as expected diff --git a/tests/unit/utils/test_versions.py b/tests/unit/utils/test_versions.py index a25feb2a942..79d6110b50b 100644 --- a/tests/unit/utils/test_versions.py +++ b/tests/unit/utils/test_versions.py @@ -17,7 +17,7 @@ import warnings # Import Salt Testing libs from tests.support.unit import TestCase, skipIf -from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import patch from tests.support.paths import CODE_DIR # Import Salt libs @@ -135,7 +135,6 @@ class VersionTestCase(TestCase): class VersionFuncsTestCase(TestCase): - @skipIf(NO_MOCK, NO_MOCK_REASON) def test_compare(self): ret = salt.utils.versions.compare('1.0', '==', '1.0') self.assertTrue(ret) diff --git a/tests/unit/utils/test_vmware.py b/tests/unit/utils/test_vmware.py index 583cfaed34a..d0a225d4970 100644 --- a/tests/unit/utils/test_vmware.py +++ b/tests/unit/utils/test_vmware.py @@ -17,8 +17,6 @@ from tests.support.runtests import RUNTIME_VARS from tests.support.unit import TestCase, skipIf from tests.support.mixins import LoaderModuleMockMixin from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON, patch, MagicMock, PropertyMock, @@ -65,7 +63,6 @@ else: log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetClusterTestCase(TestCase): ''' @@ -254,7 +251,6 @@ class CreateClusterTestCase(TestCase): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class UpdateClusterTestCase(TestCase): ''' @@ -330,7 +326,6 @@ class UpdateClusterTestCase(TestCase): self.mock_task, 'fake_cluster', 'ClusterUpdateTask') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class WaitForTaskTestCase(TestCase): ''' @@ -573,7 +568,6 @@ class WaitForTaskTestCase(TestCase): 'InvalidArgumentFault msg (LocalFault msg)') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetMorsWithPropertiesTestCase(TestCase): ''' @@ -783,7 +777,6 @@ class GetMorsWithPropertiesTestCase(TestCase): 'object': inner_obj_mock}) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetPropertiesOfManagedObjectTestCase(TestCase): ''' @@ -855,7 +848,6 @@ class GetPropertiesOfManagedObjectTestCase(TestCase): 'retrieved', excinfo.exception.strerror) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetManagedObjectName(TestCase): ''' @@ -892,7 +884,6 @@ class GetManagedObjectName(TestCase): self.assertEqual(ret, 'fake_name') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetContentTestCase(TestCase): ''' @@ -1174,7 +1165,6 @@ class GetContentTestCase(TestCase): obj=container_ref_mock, skip=False, selectSet=None) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetRootFolderTestCase(TestCase): ''' @@ -1218,7 +1208,6 @@ class GetRootFolderTestCase(TestCase): self.assertEqual(ret, self.mock_root_folder) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetServiceInfoTestCase(TestCase): ''' @@ -1268,7 +1257,6 @@ class GetServiceInfoTestCase(TestCase): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_GSSAPI, 'The \'gssapi\' library is missing') class GssapiTokenTest(TestCase): @@ -1346,7 +1334,6 @@ class GssapiTokenTest(TestCase): excinfo.exception.strerror) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class PrivateGetServiceInstanceTestCase(TestCase): ''' @@ -1796,7 +1783,6 @@ class PrivateGetServiceInstanceTestCase(TestCase): self.assertIn('VimFault', excinfo.Exception.message) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetServiceInstanceTestCase(TestCase): ''' @@ -1971,7 +1957,6 @@ class GetServiceInstanceTestCase(TestCase): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class DisconnectTestCase(TestCase): ''' @@ -2019,7 +2004,6 @@ class DisconnectTestCase(TestCase): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class IsConnectionToAVCenterTestCase(TestCase): ''' @@ -2079,7 +2063,6 @@ class IsConnectionToAVCenterTestCase(TestCase): excinfo.exception.strerror) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetNewServiceInstanceStub(TestCase, LoaderModuleMockMixin): ''' @@ -2171,7 +2154,6 @@ class GetNewServiceInstanceStub(TestCase, LoaderModuleMockMixin): self.assertEqual(ret, self.mock_new_stub) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetServiceInstanceFromManagedObjectTestCase(TestCase): ''' @@ -2227,7 +2209,6 @@ class GetServiceInstanceFromManagedObjectTestCase(TestCase): self.assertEqual(ret._stub, self.mock_stub) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetDatacentersTestCase(TestCase): ''' @@ -2295,7 +2276,6 @@ class GetDatacentersTestCase(TestCase): self.assertEqual(res, [self.mock_dc1, self.mock_dc2]) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetDatacenterTestCase(TestCase): ''' @@ -2336,7 +2316,6 @@ class GetDatacenterTestCase(TestCase): self.assertEqual(res, self.mock_dc) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class CreateDatacenterTestCase(TestCase): ''' @@ -2415,7 +2394,6 @@ class FakeTaskClass(object): pass -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetDvssTestCase(TestCase): def setUp(self): @@ -2490,7 +2468,6 @@ class GetDvssTestCase(TestCase): self.mock_items[2]['object']]) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetNetworkFolderTestCase(TestCase): def setUp(self): @@ -2557,7 +2534,6 @@ class GetNetworkFolderTestCase(TestCase): self.assertEqual(ret, self.mock_entries[0]['object']) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class CreateDvsTestCase(TestCase): def setUp(self): @@ -2661,7 +2637,6 @@ class CreateDvsTestCase(TestCase): ) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class UpdateDvsTestCase(TestCase): def setUp(self): @@ -2732,7 +2707,6 @@ class UpdateDvsTestCase(TestCase): ) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class SetDvsNetworkResourceManagementEnabledTestCase(TestCase): def setUp(self): @@ -2798,7 +2772,6 @@ class SetDvsNetworkResourceManagementEnabledTestCase(TestCase): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetDvportgroupsTestCase(TestCase): def setUp(self): @@ -2892,7 +2865,6 @@ class GetDvportgroupsTestCase(TestCase): self.mock_items[2]['object']]) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetUplinkDvportgroupTestCase(TestCase): def setUp(self): @@ -2961,7 +2933,6 @@ class GetUplinkDvportgroupTestCase(TestCase): self.assertEqual(ret, self.mock_items[1]['object']) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class CreateDvportgroupTestCase(TestCase): def setUp(self): @@ -3033,7 +3004,6 @@ class CreateDvportgroupTestCase(TestCase): ) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class UpdateDvportgroupTestCase(TestCase): def setUp(self): @@ -3108,7 +3078,6 @@ class UpdateDvportgroupTestCase(TestCase): ) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class RemoveDvportgroupTestCase(TestCase): def setUp(self): @@ -3177,7 +3146,6 @@ class RemoveDvportgroupTestCase(TestCase): ) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetHostsTestCase(TestCase): ''' @@ -3312,7 +3280,6 @@ class GetHostsTestCase(TestCase): self.assertEqual(res, [self.mock_host1]) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetLicenseManagerTestCase(TestCase): ''' @@ -3363,7 +3330,6 @@ class GetLicenseManagerTestCase(TestCase): self.assertEqual(ret, self.mock_lic_mgr) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetLicenseAssignmentManagerTestCase(TestCase): ''' @@ -3422,7 +3388,6 @@ class GetLicenseAssignmentManagerTestCase(TestCase): self.assertEqual(ret, self.mock_lic_assign_mgr) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetLicensesTestCase(TestCase): ''' @@ -3497,7 +3462,6 @@ class GetLicensesTestCase(TestCase): self.assertEqual(ret, self.mock_licenses) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class AddLicenseTestCase(TestCase): ''' @@ -3598,7 +3562,6 @@ class AddLicenseTestCase(TestCase): self.assertEqual(ret, self.mock_license) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetAssignedLicensesTestCase(TestCase): ''' @@ -3777,7 +3740,6 @@ class GetAssignedLicensesTestCase(TestCase): self.assertEqual(ret, self.mock_assignments) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class AssignLicenseTestCase(TestCase): ''' @@ -3956,7 +3918,6 @@ class AssignLicenseTestCase(TestCase): self.assertEqual(ret, self.mock_license) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetStorageSystemTestCase(TestCase): ''' @@ -4041,7 +4002,6 @@ class GetStorageSystemTestCase(TestCase): self.assertEqual(res, self.mock_obj) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class GetDatastoresTestCase(TestCase): ''' @@ -4266,7 +4226,6 @@ class GetDatastoresTestCase(TestCase): self.mock_entries[2]['object']]) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') class RenameDatastoreTestCase(TestCase): ''' @@ -4330,7 +4289,6 @@ class RenameDatastoreTestCase(TestCase): 'fake_new_name') -@skipIf(NO_MOCK, NO_MOCK_REASON) class ConvertToKbTestCase(TestCase): ''' Tests for converting units @@ -4352,7 +4310,6 @@ class ConvertToKbTestCase(TestCase): self.assertRaises(ArgumentValueError, salt.utils.vmware.convert_to_kb, 'test', 10) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @patch('salt.utils.vmware.get_managed_object_name', MagicMock()) @patch('salt.utils.vmware.wait_for_task', MagicMock()) @@ -4424,7 +4381,6 @@ class CreateVirtualMachineTestCase(TestCase): self.mock_task, self.vm_name, 'CreateVM Task', 10, 'info') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @patch('salt.utils.vmware.get_managed_object_name', MagicMock()) @patch('salt.utils.vmware.wait_for_task', MagicMock()) @@ -4496,7 +4452,6 @@ class RegisterVirtualMachineTestCase(TestCase): self.mock_task, self.vm_name, 'RegisterVM Task') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @patch('salt.utils.vmware.get_managed_object_name', MagicMock()) @patch('salt.utils.vmware.wait_for_task', MagicMock()) @@ -4541,7 +4496,6 @@ class UpdateVirtualMachineTestCase(TestCase): self.mock_task, 'my_vm', 'ReconfigureVM Task') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @patch('salt.utils.vmware.get_managed_object_name', MagicMock()) @patch('salt.utils.vmware.wait_for_task', MagicMock()) @@ -4585,7 +4539,6 @@ class DeleteVirtualMachineTestCase(TestCase): self.mock_task, 'my_vm', 'Destroy Task') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @patch('salt.utils.vmware.get_managed_object_name', MagicMock()) class UnregisterVirtualMachineTestCase(TestCase): diff --git a/tests/unit/utils/test_vsan.py b/tests/unit/utils/test_vsan.py index 3ce6f63c402..403a2861e9c 100644 --- a/tests/unit/utils/test_vsan.py +++ b/tests/unit/utils/test_vsan.py @@ -12,7 +12,7 @@ import logging # Import Salt testing libraries from tests.support.mixins import LoaderModuleMockMixin from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock, \ +from tests.support.mock import patch, MagicMock, \ PropertyMock # Import Salt libraries @@ -32,7 +32,6 @@ HAS_PYVSAN = vsan.HAS_PYVSAN log = logging.getLogger(__name__) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'vsan\' ext library is missing') class VsanSupportedTestCase(TestCase): @@ -80,7 +79,6 @@ class VsanSupportedTestCase(TestCase): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'vsan\' ext library is missing') class GetVsanClusterConfigSystemTestCase(TestCase, LoaderModuleMockMixin): @@ -138,7 +136,6 @@ class GetVsanClusterConfigSystemTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(ret, self.mock_ret) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'pyvsan\' bindings are missing') class GetVsanDiskManagementSystemTestCase(TestCase, LoaderModuleMockMixin): @@ -196,7 +193,6 @@ class GetVsanDiskManagementSystemTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(ret, self.mock_ret) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'vsan\' ext library is missing') class GetHostVsanSystemTestCase(TestCase): @@ -279,7 +275,6 @@ class GetHostVsanSystemTestCase(TestCase): self.assertEqual(res, self.mock_vsan_system) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'vsan\' ext library is missing') class CreateDiskgroupTestCase(TestCase): @@ -408,7 +403,6 @@ class CreateDiskgroupTestCase(TestCase): self.assertTrue(res) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'vsan\' ext library is missing') class AddCapacityToDiskGroupTestCase(TestCase): @@ -547,7 +541,6 @@ class AddCapacityToDiskGroupTestCase(TestCase): self.assertTrue(res) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'vsan\' ext library is missing') class RemoveCapacityFromDiskGroup(TestCase): @@ -664,7 +657,6 @@ class RemoveCapacityFromDiskGroup(TestCase): self.assertTrue(res) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'vsan\' ext library is missing') class RemoveDiskgroup(TestCase): @@ -783,7 +775,6 @@ class RemoveDiskgroup(TestCase): self.assertTrue(res) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'vsan\' ext library is missing') class GetClusterVsanInfoTestCase(TestCase, LoaderModuleMockMixin): @@ -864,7 +855,6 @@ class GetClusterVsanInfoTestCase(TestCase, LoaderModuleMockMixin): self.assertEqual(excinfo.exception.strerror, 'RuntimeFault msg') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'vsan\' ext library is missing') class ReconfigureClusterVsanTestCase(TestCase): @@ -970,7 +960,6 @@ class ReconfigureClusterVsanTestCase(TestCase): self.mock_si) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_PYVMOMI, 'The \'pyvmomi\' library is missing') @skipIf(not HAS_PYVSAN, 'The \'vsan\' ext library is missing') class _WaitForTasks(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/utils/test_win_dacl.py b/tests/unit/utils/test_win_dacl.py index 9caf2163957..49698217f99 100644 --- a/tests/unit/utils/test_win_dacl.py +++ b/tests/unit/utils/test_win_dacl.py @@ -8,7 +8,6 @@ import tempfile # Import Salt Testing Libs from tests.support.helpers import destructiveTest, generate_random_name, patch from tests.support.mixins import LoaderModuleMockMixin -from tests.support.mock import NO_MOCK, NO_MOCK_REASON from tests.support.unit import TestCase, skipIf # Import Salt Libs @@ -26,7 +25,6 @@ except ImportError: FAKE_KEY = 'SOFTWARE\\{0}'.format(generate_random_name('SaltTesting-')) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_WIN32, 'Requires pywin32') @skipIf(not salt.utils.platform.is_windows(), 'System is not Windows') class WinDaclTestCase(TestCase): @@ -83,7 +81,6 @@ class WinDaclTestCase(TestCase): self.assertEqual(win_dacl.get_name(sid_obj), 'Administrators') -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_WIN32, 'Requires pywin32') @skipIf(not salt.utils.platform.is_windows(), 'System is not Windows') class WinDaclRegTestCase(TestCase, LoaderModuleMockMixin): @@ -383,7 +380,6 @@ class WinDaclRegTestCase(TestCase, LoaderModuleMockMixin): self.assertDictEqual(result, expected) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not HAS_WIN32, 'Requires pywin32') @skipIf(not salt.utils.platform.is_windows(), 'System is not Windows') class WinDaclFileTestCase(TestCase, LoaderModuleMockMixin): diff --git a/tests/unit/utils/test_win_functions.py b/tests/unit/utils/test_win_functions.py index 240d78a19fc..2cad56966e2 100644 --- a/tests/unit/utils/test_win_functions.py +++ b/tests/unit/utils/test_win_functions.py @@ -5,7 +5,7 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.unit import TestCase, skipIf -from tests.support.mock import patch, MagicMock, NO_MOCK, NO_MOCK_REASON +from tests.support.mock import patch, MagicMock # Import Salt Libs import salt.utils.platform @@ -23,7 +23,6 @@ except ImportError: HAS_WIN32 = False -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinFunctionsTestCase(TestCase): ''' Test cases for salt.utils.win_functions diff --git a/tests/unit/utils/test_win_lgpo_auditpol.py b/tests/unit/utils/test_win_lgpo_auditpol.py index b7b288a64ca..6c627fa6d34 100644 --- a/tests/unit/utils/test_win_lgpo_auditpol.py +++ b/tests/unit/utils/test_win_lgpo_auditpol.py @@ -6,7 +6,7 @@ import random # Import Salt Testing Libs from tests.support.mixins import LoaderModuleMockMixin -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch, MagicMock +from tests.support.mock import patch, MagicMock from tests.support.unit import TestCase, skipIf # Import Salt Libs @@ -17,7 +17,6 @@ import salt.utils.win_lgpo_auditpol as win_lgpo_auditpol settings = ['No Auditing', 'Success', 'Failure', 'Success and Failure'] -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.utils.platform.is_windows(), 'System is not Windows') class WinLgpoAuditpolTestCase(TestCase, LoaderModuleMockMixin): def setup_loader_modules(self): diff --git a/tests/unit/utils/test_win_lgpo_netsh.py b/tests/unit/utils/test_win_lgpo_netsh.py index f268598d142..fc0b1e8e44f 100644 --- a/tests/unit/utils/test_win_lgpo_netsh.py +++ b/tests/unit/utils/test_win_lgpo_netsh.py @@ -5,7 +5,6 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.helpers import destructiveTest -from tests.support.mock import NO_MOCK, NO_MOCK_REASON from tests.support.unit import TestCase, skipIf # Import Salt Libs @@ -14,7 +13,6 @@ import salt.utils.win_lgpo_netsh as win_lgpo_netsh from salt.exceptions import CommandExecutionError -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.utils.platform.is_windows(), 'System is not Windows') class WinLgpoNetshTestCase(TestCase): def test_get_settings_firewallpolicy_local(self): diff --git a/tests/unit/utils/test_win_osinfo.py b/tests/unit/utils/test_win_osinfo.py index 7f7f5ca944a..82c459b4b4c 100644 --- a/tests/unit/utils/test_win_osinfo.py +++ b/tests/unit/utils/test_win_osinfo.py @@ -11,10 +11,6 @@ from salt.ext import six # Import Salt Testing Libs from tests.support.unit import TestCase, skipIf -from tests.support.mock import ( - NO_MOCK, - NO_MOCK_REASON -) # Import Salt Libs import salt.utils.win_osinfo as win_osinfo @@ -22,7 +18,6 @@ import salt.utils.platform @skipIf(not salt.utils.platform.is_windows(), 'Requires Windows') -@skipIf(NO_MOCK, NO_MOCK_REASON) class WinOsInfo(TestCase): ''' Test cases for salt/utils/win_osinfo.py diff --git a/tests/unit/utils/test_win_pdh.py b/tests/unit/utils/test_win_pdh.py index b64d7c67f53..955edca84b8 100644 --- a/tests/unit/utils/test_win_pdh.py +++ b/tests/unit/utils/test_win_pdh.py @@ -4,7 +4,6 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs -from tests.support.mock import NO_MOCK, NO_MOCK_REASON from tests.support.unit import TestCase, skipIf # Import Salt Libs @@ -12,7 +11,6 @@ import salt.utils.platform import salt.utils.win_pdh as win_pdh -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.utils.platform.is_windows(), 'System is not Windows') class WinPdhTestCase(TestCase): def test_list_objects(self): diff --git a/tests/unit/utils/test_win_reg.py b/tests/unit/utils/test_win_reg.py index 2d3961c54d2..7af97b5f37e 100644 --- a/tests/unit/utils/test_win_reg.py +++ b/tests/unit/utils/test_win_reg.py @@ -5,7 +5,7 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing Libs from tests.support.helpers import destructiveTest, generate_random_name -from tests.support.mock import NO_MOCK, NO_MOCK_REASON, patch +from tests.support.mock import patch from tests.support.unit import TestCase, skipIf # Import Salt Libs @@ -18,7 +18,6 @@ UNICODE_VALUE = 'Unicode Value ' \ FAKE_KEY = 'SOFTWARE\\{0}'.format(generate_random_name('SaltTesting-')) -@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not salt.utils.platform.is_windows(), 'System is not Windows') class WinFunctionsTestCase(TestCase): ''' diff --git a/tests/unit/utils/test_yamldumper.py b/tests/unit/utils/test_yamldumper.py index 7056d90fec2..7168f48eccc 100644 --- a/tests/unit/utils/test_yamldumper.py +++ b/tests/unit/utils/test_yamldumper.py @@ -11,11 +11,9 @@ import salt.ext.six import salt.utils.yamldumper # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase -@skipIf(NO_MOCK, NO_MOCK_REASON) class YamlDumperTestCase(TestCase): ''' TestCase for salt.utils.yamldumper module diff --git a/tests/unit/utils/test_yamlloader.py b/tests/unit/utils/test_yamlloader.py index 4222b30260e..65d3850d584 100644 --- a/tests/unit/utils/test_yamlloader.py +++ b/tests/unit/utils/test_yamlloader.py @@ -15,14 +15,13 @@ import salt.utils.files from salt.ext import six # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import patch, NO_MOCK, NO_MOCK_REASON, mock_open +from tests.support.unit import TestCase +from tests.support.mock import patch, mock_open # Import 3rd-party libs from salt.ext import six -@skipIf(NO_MOCK, NO_MOCK_REASON) class YamlLoaderTestCase(TestCase): ''' TestCase for salt.utils.yamlloader module diff --git a/tests/unit/utils/test_zeromq.py b/tests/unit/utils/test_zeromq.py index 14239bd3f6c..28745b85094 100644 --- a/tests/unit/utils/test_zeromq.py +++ b/tests/unit/utils/test_zeromq.py @@ -12,8 +12,6 @@ from salt._compat import ipaddress from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, - NO_MOCK, - NO_MOCK_REASON ) # Import salt libs @@ -33,7 +31,6 @@ class UtilsTestCase(TestCase): ip_addr_obj = ipaddress.ip_address(test_ipv4) self.assertEqual(test_ipv4, salt.utils.zeromq.ip_bracket(ip_addr_obj)) - @skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(not hasattr(zmq, 'IPC_PATH_MAX_LEN'), "ZMQ does not have max length support.") def test_check_ipc_length(self): ''' diff --git a/tests/unit/utils/test_zfs.py b/tests/unit/utils/test_zfs.py index 37ad70df087..d94b06815b7 100644 --- a/tests/unit/utils/test_zfs.py +++ b/tests/unit/utils/test_zfs.py @@ -15,12 +15,10 @@ from __future__ import absolute_import, unicode_literals, print_function # Import Salt Testing libs from tests.support.zfs import ZFSMockData -from tests.support.unit import skipIf, TestCase +from tests.support.unit import TestCase from tests.support.mock import ( MagicMock, patch, - NO_MOCK, - NO_MOCK_REASON, ) # Import Salt Execution module to test @@ -31,7 +29,6 @@ from salt.utils.odict import OrderedDict # Skip this test case if we don't have access to mock! -@skipIf(NO_MOCK, NO_MOCK_REASON) class ZfsUtilsTestCase(TestCase): ''' This class contains a set of functions that test salt.utils.zfs utils diff --git a/tests/unit/utils/validate/test_net.py b/tests/unit/utils/validate/test_net.py index 1114a31a02e..debbcab76f4 100644 --- a/tests/unit/utils/validate/test_net.py +++ b/tests/unit/utils/validate/test_net.py @@ -7,11 +7,9 @@ from __future__ import absolute_import, print_function, unicode_literals from salt.utils.validate import net # Import Salt Testing Libs -from tests.support.unit import TestCase, skipIf -from tests.support.mock import NO_MOCK, NO_MOCK_REASON +from tests.support.unit import TestCase -@skipIf(NO_MOCK, NO_MOCK_REASON) class ValidateNetTestCase(TestCase): ''' TestCase for salt.utils.validate.net module