From 8517b1d6d18d7558649b41ed2367adb9ddd50e17 Mon Sep 17 00:00:00 2001 From: juniorsysadmin Date: Sat, 31 Mar 2018 20:33:08 +1100 Subject: [PATCH] Use one operating system for most RSpec tests The majority of Puppet classes and defined types in this module do not have behaviour which changes depending on the operating system. Mock one operating system for most tests, except for collectd_init_spec when mocking multiple operating systems makes sense. This attempts to address #633 , and should reduce test runtimes considerably with little change in the confidence of tests actually picking up problems. --- spec/classes/collectd_init_spec.rb | 2 +- spec/classes/collectd_plugin_amqp_spec.rb | 2 +- spec/classes/collectd_plugin_ceph_spec.rb | 2 +- spec/classes/collectd_plugin_cgroups_spec.rb | 2 +- spec/classes/collectd_plugin_cpu_spec.rb | 2 +- spec/classes/collectd_plugin_cuda_spec.rb | 2 +- spec/classes/collectd_plugin_curl_spec.rb | 2 +- spec/classes/collectd_plugin_dbi_spec.rb | 2 +- spec/classes/collectd_plugin_df_spec.rb | 2 +- spec/classes/collectd_plugin_disk_spec.rb | 2 +- spec/classes/collectd_plugin_dns_spec.rb | 2 +- spec/classes/collectd_plugin_ethstat.rb | 2 +- spec/classes/collectd_plugin_exec_spec.rb | 2 +- spec/classes/collectd_plugin_fhcount_spec.rb | 2 +- spec/classes/collectd_plugin_filecount_spec.rb | 2 +- spec/classes/collectd_plugin_filter_spec.rb | 2 +- spec/classes/collectd_plugin_genericjmx_spec.rb | 2 +- spec/classes/collectd_plugin_hddtemp_spec.rb | 2 +- spec/classes/collectd_plugin_intel_pmu_spec.rb | 2 +- spec/classes/collectd_plugin_interface_spec.rb | 2 +- spec/classes/collectd_plugin_ipmi.rb | 2 +- spec/classes/collectd_plugin_iptables_spec.rb | 2 +- spec/classes/collectd_plugin_irq_spec.rb | 2 +- spec/classes/collectd_plugin_iscdhcp_spec.rb | 2 +- spec/classes/collectd_plugin_java_spec.rb | 2 +- spec/classes/collectd_plugin_load_spec.rb | 2 +- spec/classes/collectd_plugin_logfile_spec.rb | 2 +- spec/classes/collectd_plugin_memcached_spec.rb | 2 +- spec/classes/collectd_plugin_memory_spec.rb | 2 +- spec/classes/collectd_plugin_mongodb_spec.rb | 2 +- spec/classes/collectd_plugin_netlink_spec.rb | 2 +- spec/classes/collectd_plugin_network_spec.rb | 2 +- spec/classes/collectd_plugin_openldap_spec.rb | 2 +- spec/classes/collectd_plugin_openvpn_spec.rb | 2 +- spec/classes/collectd_plugin_oracle_spec.rb | 2 +- spec/classes/collectd_plugin_ovs_events_spec.rb | 2 +- spec/classes/collectd_plugin_ovs_stats_spec.rb | 2 +- spec/classes/collectd_plugin_ping_spec.rb | 2 +- spec/classes/collectd_plugin_postgresql_spec.rb | 2 +- spec/classes/collectd_plugin_processes_spec.rb | 2 +- spec/classes/collectd_plugin_protocols_spec.rb | 2 +- spec/classes/collectd_plugin_python_spec.rb | 2 +- spec/classes/collectd_plugin_rabbitmq_spec.rb | 2 +- spec/classes/collectd_plugin_redis_spec.rb | 2 +- spec/classes/collectd_plugin_rrdtool_spec.rb | 2 +- spec/classes/collectd_plugin_smart_spec.rb | 2 +- spec/classes/collectd_plugin_snmp_spec.rb | 2 +- spec/classes/collectd_plugin_statsd_spec.rb | 2 +- spec/classes/collectd_plugin_swap_spec.rb | 2 +- spec/classes/collectd_plugin_tcpconns_spec.rb | 2 +- spec/classes/collectd_plugin_thermal_spec.rb | 2 +- spec/classes/collectd_plugin_threshold_spec.rb | 2 +- spec/classes/collectd_plugin_turbostat_spec.rb | 2 +- spec/classes/collectd_plugin_unixsock_spec.rb | 2 +- spec/classes/collectd_plugin_uuid_spec.rb | 2 +- spec/classes/collectd_plugin_varnish_spec.rb | 2 +- spec/classes/collectd_plugin_virt_spec.rb | 2 +- spec/classes/collectd_plugin_write_graphite_spec.rb | 2 +- spec/classes/collectd_plugin_write_kafka_spec.rb | 2 +- spec/classes/collectd_plugin_write_log_spec.rb | 2 +- .../collectd_plugin_write_prometheus_spec.rb | 2 +- spec/classes/collectd_plugin_write_riemann_spec.rb | 2 +- spec/classes/collectd_plugin_write_tsdb_spec.rb | 2 +- spec/classes/collectd_plugin_zfs_arc_spec.rb | 2 +- spec/classes/collectd_plugin_zookeeper_spec.rb | 2 +- .../defines/collectd_plugin_apache_instance_spec.rb | 2 +- spec/defines/collectd_plugin_curl_page_spec.rb | 2 +- spec/defines/collectd_plugin_exec_cmd_spec.rb | 2 +- .../collectd_plugin_filecount_directory_spec.rb | 2 +- spec/defines/collectd_plugin_filter_chain_spec.rb | 2 +- spec/defines/collectd_plugin_filter_match_spec.rb | 2 +- spec/defines/collectd_plugin_filter_rule_spec.rb | 2 +- spec/defines/collectd_plugin_filter_target_spec.rb | 2 +- .../collectd_plugin_genericjmx_connection_spec.rb | 2 +- .../collectd_plugin_genericjmx_mbean_spec.rb | 2 +- spec/defines/collectd_plugin_mysql_database_spec.rb | 2 +- .../collectd_plugin_network_listener_spec.rb | 2 +- spec/defines/collectd_plugin_network_server_spec.rb | 2 +- .../defines/collectd_plugin_oracle_database_spec.rb | 2 +- spec/defines/collectd_plugin_oracle_query_spec.rb | 2 +- spec/defines/collectd_plugin_python_module_spec.rb | 2 +- spec/defines/collectd_plugin_snmp_data_spec.rb | 2 +- spec/defines/collectd_plugin_snmp_host_spec.rb | 2 +- spec/defines/collectd_plugin_spec.rb | 2 +- spec/defines/collectd_plugin_tail_file_spec.rb | 2 +- spec/defines/collectd_plugin_write_graphite_spec.rb | 2 +- spec/defines/collectd_typesdb_spec.rb | 2 +- spec/spec_helper_methods.rb | 13 ++++++++++++- 88 files changed, 99 insertions(+), 88 deletions(-) diff --git a/spec/classes/collectd_init_spec.rb b/spec/classes/collectd_init_spec.rb index 0bc89f4f9..34a7b4cbc 100644 --- a/spec/classes/collectd_init_spec.rb +++ b/spec/classes/collectd_init_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os.each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_amqp_spec.rb b/spec/classes/collectd_plugin_amqp_spec.rb index 6b63ef221..8f3dff1ef 100644 --- a/spec/classes/collectd_plugin_amqp_spec.rb +++ b/spec/classes/collectd_plugin_amqp_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::amqp', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_ceph_spec.rb b/spec/classes/collectd_plugin_ceph_spec.rb index 169c825ab..a9e3cccf8 100644 --- a/spec/classes/collectd_plugin_ceph_spec.rb +++ b/spec/classes/collectd_plugin_ceph_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::ceph', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_cgroups_spec.rb b/spec/classes/collectd_plugin_cgroups_spec.rb index 696e25c18..f33ebda80 100644 --- a/spec/classes/collectd_plugin_cgroups_spec.rb +++ b/spec/classes/collectd_plugin_cgroups_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::cgroups', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_cpu_spec.rb b/spec/classes/collectd_plugin_cpu_spec.rb index 1d5058a83..c02a49fec 100644 --- a/spec/classes/collectd_plugin_cpu_spec.rb +++ b/spec/classes/collectd_plugin_cpu_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::cpu', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_cuda_spec.rb b/spec/classes/collectd_plugin_cuda_spec.rb index 701ff2202..b83146b31 100644 --- a/spec/classes/collectd_plugin_cuda_spec.rb +++ b/spec/classes/collectd_plugin_cuda_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::cuda', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_curl_spec.rb b/spec/classes/collectd_plugin_curl_spec.rb index e093e5537..d106eef70 100644 --- a/spec/classes/collectd_plugin_curl_spec.rb +++ b/spec/classes/collectd_plugin_curl_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::curl', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_dbi_spec.rb b/spec/classes/collectd_plugin_dbi_spec.rb index f8060631c..6a7f8ba83 100644 --- a/spec/classes/collectd_plugin_dbi_spec.rb +++ b/spec/classes/collectd_plugin_dbi_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::dbi', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_df_spec.rb b/spec/classes/collectd_plugin_df_spec.rb index 7589f7aca..142c49dd0 100644 --- a/spec/classes/collectd_plugin_df_spec.rb +++ b/spec/classes/collectd_plugin_df_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::df', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_disk_spec.rb b/spec/classes/collectd_plugin_disk_spec.rb index 543d87fd7..071abd88a 100644 --- a/spec/classes/collectd_plugin_disk_spec.rb +++ b/spec/classes/collectd_plugin_disk_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::disk', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_dns_spec.rb b/spec/classes/collectd_plugin_dns_spec.rb index 382d4dff7..c5986ca26 100644 --- a/spec/classes/collectd_plugin_dns_spec.rb +++ b/spec/classes/collectd_plugin_dns_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::dns', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_ethstat.rb b/spec/classes/collectd_plugin_ethstat.rb index ec9239b3c..04e19aae4 100644 --- a/spec/classes/collectd_plugin_ethstat.rb +++ b/spec/classes/collectd_plugin_ethstat.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::ethstat', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_exec_spec.rb b/spec/classes/collectd_plugin_exec_spec.rb index 888099854..4b130bd5e 100644 --- a/spec/classes/collectd_plugin_exec_spec.rb +++ b/spec/classes/collectd_plugin_exec_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::exec', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_fhcount_spec.rb b/spec/classes/collectd_plugin_fhcount_spec.rb index c82ca5945..4846a8155 100644 --- a/spec/classes/collectd_plugin_fhcount_spec.rb +++ b/spec/classes/collectd_plugin_fhcount_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::fhcount', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_filecount_spec.rb b/spec/classes/collectd_plugin_filecount_spec.rb index 76ef2f6b1..85aa341c0 100644 --- a/spec/classes/collectd_plugin_filecount_spec.rb +++ b/spec/classes/collectd_plugin_filecount_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::filecount', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_filter_spec.rb b/spec/classes/collectd_plugin_filter_spec.rb index 4d55a1d2d..2444d1f5a 100644 --- a/spec/classes/collectd_plugin_filter_spec.rb +++ b/spec/classes/collectd_plugin_filter_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::filter', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_genericjmx_spec.rb b/spec/classes/collectd_plugin_genericjmx_spec.rb index ca6fb35ea..4daa47f84 100644 --- a/spec/classes/collectd_plugin_genericjmx_spec.rb +++ b/spec/classes/collectd_plugin_genericjmx_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::genericjmx', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do options = os_specific_options(facts) let :facts do diff --git a/spec/classes/collectd_plugin_hddtemp_spec.rb b/spec/classes/collectd_plugin_hddtemp_spec.rb index e5325ceaa..6d4d6a22f 100644 --- a/spec/classes/collectd_plugin_hddtemp_spec.rb +++ b/spec/classes/collectd_plugin_hddtemp_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::hddtemp', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_intel_pmu_spec.rb b/spec/classes/collectd_plugin_intel_pmu_spec.rb index 0391c16f1..8d0c92b00 100644 --- a/spec/classes/collectd_plugin_intel_pmu_spec.rb +++ b/spec/classes/collectd_plugin_intel_pmu_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::intel_pmu', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_interface_spec.rb b/spec/classes/collectd_plugin_interface_spec.rb index a65e031f5..1f9de973b 100644 --- a/spec/classes/collectd_plugin_interface_spec.rb +++ b/spec/classes/collectd_plugin_interface_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::interface', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_ipmi.rb b/spec/classes/collectd_plugin_ipmi.rb index 6c977b642..2efcdd346 100644 --- a/spec/classes/collectd_plugin_ipmi.rb +++ b/spec/classes/collectd_plugin_ipmi.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::ipmi', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do options = os_specific_options(facts) let :facts do diff --git a/spec/classes/collectd_plugin_iptables_spec.rb b/spec/classes/collectd_plugin_iptables_spec.rb index 994173267..fc7e0387c 100644 --- a/spec/classes/collectd_plugin_iptables_spec.rb +++ b/spec/classes/collectd_plugin_iptables_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::iptables', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_irq_spec.rb b/spec/classes/collectd_plugin_irq_spec.rb index 35ef42dba..ce31b6889 100644 --- a/spec/classes/collectd_plugin_irq_spec.rb +++ b/spec/classes/collectd_plugin_irq_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::irq', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_iscdhcp_spec.rb b/spec/classes/collectd_plugin_iscdhcp_spec.rb index 701ff2202..b83146b31 100644 --- a/spec/classes/collectd_plugin_iscdhcp_spec.rb +++ b/spec/classes/collectd_plugin_iscdhcp_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::cuda', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_java_spec.rb b/spec/classes/collectd_plugin_java_spec.rb index b0117d1b7..3570a3773 100644 --- a/spec/classes/collectd_plugin_java_spec.rb +++ b/spec/classes/collectd_plugin_java_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::java', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_load_spec.rb b/spec/classes/collectd_plugin_load_spec.rb index d3e575093..bfcfeda3f 100644 --- a/spec/classes/collectd_plugin_load_spec.rb +++ b/spec/classes/collectd_plugin_load_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::load', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_logfile_spec.rb b/spec/classes/collectd_plugin_logfile_spec.rb index 1709507c7..0842b2792 100644 --- a/spec/classes/collectd_plugin_logfile_spec.rb +++ b/spec/classes/collectd_plugin_logfile_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::logfile', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_memcached_spec.rb b/spec/classes/collectd_plugin_memcached_spec.rb index 310a1dcfa..bd978f1ed 100644 --- a/spec/classes/collectd_plugin_memcached_spec.rb +++ b/spec/classes/collectd_plugin_memcached_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::memcached', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_memory_spec.rb b/spec/classes/collectd_plugin_memory_spec.rb index 443a51252..d1e990a9c 100644 --- a/spec/classes/collectd_plugin_memory_spec.rb +++ b/spec/classes/collectd_plugin_memory_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::memory', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_mongodb_spec.rb b/spec/classes/collectd_plugin_mongodb_spec.rb index 14fdb7eee..7c832292b 100644 --- a/spec/classes/collectd_plugin_mongodb_spec.rb +++ b/spec/classes/collectd_plugin_mongodb_spec.rb @@ -12,7 +12,7 @@ } end - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_netlink_spec.rb b/spec/classes/collectd_plugin_netlink_spec.rb index 3c8bbe52e..70a584751 100644 --- a/spec/classes/collectd_plugin_netlink_spec.rb +++ b/spec/classes/collectd_plugin_netlink_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::netlink', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_network_spec.rb b/spec/classes/collectd_plugin_network_spec.rb index df6f24367..b84588741 100644 --- a/spec/classes/collectd_plugin_network_spec.rb +++ b/spec/classes/collectd_plugin_network_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::network', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_openldap_spec.rb b/spec/classes/collectd_plugin_openldap_spec.rb index 6560b3ac6..624897143 100644 --- a/spec/classes/collectd_plugin_openldap_spec.rb +++ b/spec/classes/collectd_plugin_openldap_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::openldap', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_openvpn_spec.rb b/spec/classes/collectd_plugin_openvpn_spec.rb index b3c421edb..c4c8d9f0e 100644 --- a/spec/classes/collectd_plugin_openvpn_spec.rb +++ b/spec/classes/collectd_plugin_openvpn_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::openvpn', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_oracle_spec.rb b/spec/classes/collectd_plugin_oracle_spec.rb index a8913dbc5..1d5206fd3 100644 --- a/spec/classes/collectd_plugin_oracle_spec.rb +++ b/spec/classes/collectd_plugin_oracle_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::oracle', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do options = os_specific_options(facts) let :facts do diff --git a/spec/classes/collectd_plugin_ovs_events_spec.rb b/spec/classes/collectd_plugin_ovs_events_spec.rb index 854e970cb..2258a646e 100644 --- a/spec/classes/collectd_plugin_ovs_events_spec.rb +++ b/spec/classes/collectd_plugin_ovs_events_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::ovs_events', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_ovs_stats_spec.rb b/spec/classes/collectd_plugin_ovs_stats_spec.rb index 14e49dbc0..661983be0 100644 --- a/spec/classes/collectd_plugin_ovs_stats_spec.rb +++ b/spec/classes/collectd_plugin_ovs_stats_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::ovs_stats', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_ping_spec.rb b/spec/classes/collectd_plugin_ping_spec.rb index e805d2feb..781549aa6 100644 --- a/spec/classes/collectd_plugin_ping_spec.rb +++ b/spec/classes/collectd_plugin_ping_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::ping', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_postgresql_spec.rb b/spec/classes/collectd_plugin_postgresql_spec.rb index 7c76b9db5..9efa7a4cf 100644 --- a/spec/classes/collectd_plugin_postgresql_spec.rb +++ b/spec/classes/collectd_plugin_postgresql_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::postgresql', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_processes_spec.rb b/spec/classes/collectd_plugin_processes_spec.rb index 9f437f536..bf9df9c94 100644 --- a/spec/classes/collectd_plugin_processes_spec.rb +++ b/spec/classes/collectd_plugin_processes_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::processes', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_protocols_spec.rb b/spec/classes/collectd_plugin_protocols_spec.rb index 58fe38846..0e5d2efe0 100644 --- a/spec/classes/collectd_plugin_protocols_spec.rb +++ b/spec/classes/collectd_plugin_protocols_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::protocols', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_python_spec.rb b/spec/classes/collectd_plugin_python_spec.rb index 54fe44e82..c8f7e464d 100644 --- a/spec/classes/collectd_plugin_python_spec.rb +++ b/spec/classes/collectd_plugin_python_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::python', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_rabbitmq_spec.rb b/spec/classes/collectd_plugin_rabbitmq_spec.rb index 337055630..9f3396a90 100644 --- a/spec/classes/collectd_plugin_rabbitmq_spec.rb +++ b/spec/classes/collectd_plugin_rabbitmq_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::rabbitmq', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_redis_spec.rb b/spec/classes/collectd_plugin_redis_spec.rb index 915a2c956..26e5a1652 100644 --- a/spec/classes/collectd_plugin_redis_spec.rb +++ b/spec/classes/collectd_plugin_redis_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::redis', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_rrdtool_spec.rb b/spec/classes/collectd_plugin_rrdtool_spec.rb index 3cd57c64a..9b3fa6833 100644 --- a/spec/classes/collectd_plugin_rrdtool_spec.rb +++ b/spec/classes/collectd_plugin_rrdtool_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::rrdtool', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_smart_spec.rb b/spec/classes/collectd_plugin_smart_spec.rb index c71d43e1b..31db1478d 100644 --- a/spec/classes/collectd_plugin_smart_spec.rb +++ b/spec/classes/collectd_plugin_smart_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::smart', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_snmp_spec.rb b/spec/classes/collectd_plugin_snmp_spec.rb index 2a927a8b2..2c988a300 100644 --- a/spec/classes/collectd_plugin_snmp_spec.rb +++ b/spec/classes/collectd_plugin_snmp_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::snmp', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_statsd_spec.rb b/spec/classes/collectd_plugin_statsd_spec.rb index d7f4c0bfa..c1bcba221 100644 --- a/spec/classes/collectd_plugin_statsd_spec.rb +++ b/spec/classes/collectd_plugin_statsd_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::statsd', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_swap_spec.rb b/spec/classes/collectd_plugin_swap_spec.rb index bb624c835..e652a8c90 100644 --- a/spec/classes/collectd_plugin_swap_spec.rb +++ b/spec/classes/collectd_plugin_swap_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::swap', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_tcpconns_spec.rb b/spec/classes/collectd_plugin_tcpconns_spec.rb index afdf90efd..709540ded 100644 --- a/spec/classes/collectd_plugin_tcpconns_spec.rb +++ b/spec/classes/collectd_plugin_tcpconns_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::tcpconns', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_thermal_spec.rb b/spec/classes/collectd_plugin_thermal_spec.rb index 393d08d18..86c426444 100644 --- a/spec/classes/collectd_plugin_thermal_spec.rb +++ b/spec/classes/collectd_plugin_thermal_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::thermal', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_threshold_spec.rb b/spec/classes/collectd_plugin_threshold_spec.rb index e2bcf1d06..bc65e278b 100644 --- a/spec/classes/collectd_plugin_threshold_spec.rb +++ b/spec/classes/collectd_plugin_threshold_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::threshold', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_turbostat_spec.rb b/spec/classes/collectd_plugin_turbostat_spec.rb index 6c06d674b..4cd00a22a 100644 --- a/spec/classes/collectd_plugin_turbostat_spec.rb +++ b/spec/classes/collectd_plugin_turbostat_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::turbostat', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_unixsock_spec.rb b/spec/classes/collectd_plugin_unixsock_spec.rb index 9ebc1d2c9..563b14fcd 100644 --- a/spec/classes/collectd_plugin_unixsock_spec.rb +++ b/spec/classes/collectd_plugin_unixsock_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::unixsock', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_uuid_spec.rb b/spec/classes/collectd_plugin_uuid_spec.rb index 639cfad45..0dd596384 100644 --- a/spec/classes/collectd_plugin_uuid_spec.rb +++ b/spec/classes/collectd_plugin_uuid_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::uuid', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_varnish_spec.rb b/spec/classes/collectd_plugin_varnish_spec.rb index cbbe30d7f..f9f82182b 100644 --- a/spec/classes/collectd_plugin_varnish_spec.rb +++ b/spec/classes/collectd_plugin_varnish_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::varnish', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_virt_spec.rb b/spec/classes/collectd_plugin_virt_spec.rb index ccaf7c4ff..6be0e6400 100644 --- a/spec/classes/collectd_plugin_virt_spec.rb +++ b/spec/classes/collectd_plugin_virt_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::virt', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_write_graphite_spec.rb b/spec/classes/collectd_plugin_write_graphite_spec.rb index 536488b9a..cd0d2f6a4 100644 --- a/spec/classes/collectd_plugin_write_graphite_spec.rb +++ b/spec/classes/collectd_plugin_write_graphite_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::write_graphite', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts.merge(collectd_version: '5.0') diff --git a/spec/classes/collectd_plugin_write_kafka_spec.rb b/spec/classes/collectd_plugin_write_kafka_spec.rb index ae31c3862..45e702d8f 100644 --- a/spec/classes/collectd_plugin_write_kafka_spec.rb +++ b/spec/classes/collectd_plugin_write_kafka_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::write_kafka', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_write_log_spec.rb b/spec/classes/collectd_plugin_write_log_spec.rb index f519b9964..6560b5925 100644 --- a/spec/classes/collectd_plugin_write_log_spec.rb +++ b/spec/classes/collectd_plugin_write_log_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::write_log', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_write_prometheus_spec.rb b/spec/classes/collectd_plugin_write_prometheus_spec.rb index 4d0c2dcf0..400709ff9 100644 --- a/spec/classes/collectd_plugin_write_prometheus_spec.rb +++ b/spec/classes/collectd_plugin_write_prometheus_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::write_prometheus', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts.merge(collectd_version: '5.7') diff --git a/spec/classes/collectd_plugin_write_riemann_spec.rb b/spec/classes/collectd_plugin_write_riemann_spec.rb index 2634d285b..712553bc8 100644 --- a/spec/classes/collectd_plugin_write_riemann_spec.rb +++ b/spec/classes/collectd_plugin_write_riemann_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::write_riemann', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_write_tsdb_spec.rb b/spec/classes/collectd_plugin_write_tsdb_spec.rb index 7f15a8f5b..6251b958d 100644 --- a/spec/classes/collectd_plugin_write_tsdb_spec.rb +++ b/spec/classes/collectd_plugin_write_tsdb_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::write_tsdb', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/classes/collectd_plugin_zfs_arc_spec.rb b/spec/classes/collectd_plugin_zfs_arc_spec.rb index 43d3202e9..12e8bb6cc 100644 --- a/spec/classes/collectd_plugin_zfs_arc_spec.rb +++ b/spec/classes/collectd_plugin_zfs_arc_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::zfs_arc', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts.merge(collectd_version: '4.8') diff --git a/spec/classes/collectd_plugin_zookeeper_spec.rb b/spec/classes/collectd_plugin_zookeeper_spec.rb index e5a71a3d7..078f13aaa 100644 --- a/spec/classes/collectd_plugin_zookeeper_spec.rb +++ b/spec/classes/collectd_plugin_zookeeper_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::zookeeper', type: :class do - on_supported_os(test_on).each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_apache_instance_spec.rb b/spec/defines/collectd_plugin_apache_instance_spec.rb index ca5a06036..d39ef9f65 100644 --- a/spec/defines/collectd_plugin_apache_instance_spec.rb +++ b/spec/defines/collectd_plugin_apache_instance_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::apache::instance', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_curl_page_spec.rb b/spec/defines/collectd_plugin_curl_page_spec.rb index 84cfb9778..77a4d5baa 100644 --- a/spec/defines/collectd_plugin_curl_page_spec.rb +++ b/spec/defines/collectd_plugin_curl_page_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::curl::page', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_exec_cmd_spec.rb b/spec/defines/collectd_plugin_exec_cmd_spec.rb index 659d13919..662554974 100644 --- a/spec/defines/collectd_plugin_exec_cmd_spec.rb +++ b/spec/defines/collectd_plugin_exec_cmd_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::exec::cmd', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_filecount_directory_spec.rb b/spec/defines/collectd_plugin_filecount_directory_spec.rb index 542fa2da5..586b8941d 100644 --- a/spec/defines/collectd_plugin_filecount_directory_spec.rb +++ b/spec/defines/collectd_plugin_filecount_directory_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::filecount::directory', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_filter_chain_spec.rb b/spec/defines/collectd_plugin_filter_chain_spec.rb index de6d57966..5b64ab9ac 100644 --- a/spec/defines/collectd_plugin_filter_chain_spec.rb +++ b/spec/defines/collectd_plugin_filter_chain_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::filter::chain', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_filter_match_spec.rb b/spec/defines/collectd_plugin_filter_match_spec.rb index cee744f14..d348d819a 100644 --- a/spec/defines/collectd_plugin_filter_match_spec.rb +++ b/spec/defines/collectd_plugin_filter_match_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::filter::match', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do options = os_specific_options(facts) let :facts do diff --git a/spec/defines/collectd_plugin_filter_rule_spec.rb b/spec/defines/collectd_plugin_filter_rule_spec.rb index 7cee2869b..fb90343c2 100644 --- a/spec/defines/collectd_plugin_filter_rule_spec.rb +++ b/spec/defines/collectd_plugin_filter_rule_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::filter::rule', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_filter_target_spec.rb b/spec/defines/collectd_plugin_filter_target_spec.rb index 8566cd283..348f872c4 100644 --- a/spec/defines/collectd_plugin_filter_target_spec.rb +++ b/spec/defines/collectd_plugin_filter_target_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::filter::target', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do options = os_specific_options(facts) let :facts do diff --git a/spec/defines/collectd_plugin_genericjmx_connection_spec.rb b/spec/defines/collectd_plugin_genericjmx_connection_spec.rb index 9ab76ec5c..64b25c5ea 100644 --- a/spec/defines/collectd_plugin_genericjmx_connection_spec.rb +++ b/spec/defines/collectd_plugin_genericjmx_connection_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::genericjmx::connection', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do options = os_specific_options(facts) let :facts do diff --git a/spec/defines/collectd_plugin_genericjmx_mbean_spec.rb b/spec/defines/collectd_plugin_genericjmx_mbean_spec.rb index 308e1286a..e155b8836 100644 --- a/spec/defines/collectd_plugin_genericjmx_mbean_spec.rb +++ b/spec/defines/collectd_plugin_genericjmx_mbean_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::genericjmx::mbean', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do options = os_specific_options(facts) let :facts do diff --git a/spec/defines/collectd_plugin_mysql_database_spec.rb b/spec/defines/collectd_plugin_mysql_database_spec.rb index 921a6d765..d487f0ef0 100644 --- a/spec/defines/collectd_plugin_mysql_database_spec.rb +++ b/spec/defines/collectd_plugin_mysql_database_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::mysql::database', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_network_listener_spec.rb b/spec/defines/collectd_plugin_network_listener_spec.rb index e6a0a87bb..9be07bc49 100644 --- a/spec/defines/collectd_plugin_network_listener_spec.rb +++ b/spec/defines/collectd_plugin_network_listener_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::network::listener', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_network_server_spec.rb b/spec/defines/collectd_plugin_network_server_spec.rb index 8c51b48be..aac6babe2 100644 --- a/spec/defines/collectd_plugin_network_server_spec.rb +++ b/spec/defines/collectd_plugin_network_server_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::network::server', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_oracle_database_spec.rb b/spec/defines/collectd_plugin_oracle_database_spec.rb index b434d9776..fb6870e2a 100644 --- a/spec/defines/collectd_plugin_oracle_database_spec.rb +++ b/spec/defines/collectd_plugin_oracle_database_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::oracle::database', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do options = os_specific_options(facts) let :facts do diff --git a/spec/defines/collectd_plugin_oracle_query_spec.rb b/spec/defines/collectd_plugin_oracle_query_spec.rb index abe83e8e7..a30f17a41 100644 --- a/spec/defines/collectd_plugin_oracle_query_spec.rb +++ b/spec/defines/collectd_plugin_oracle_query_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::oracle::query', 'type' => :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do options = os_specific_options(facts) let :facts do diff --git a/spec/defines/collectd_plugin_python_module_spec.rb b/spec/defines/collectd_plugin_python_module_spec.rb index d68e4611f..34f734e17 100644 --- a/spec/defines/collectd_plugin_python_module_spec.rb +++ b/spec/defines/collectd_plugin_python_module_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::python::module', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_snmp_data_spec.rb b/spec/defines/collectd_plugin_snmp_data_spec.rb index 3e8a8c874..625168cbb 100644 --- a/spec/defines/collectd_plugin_snmp_data_spec.rb +++ b/spec/defines/collectd_plugin_snmp_data_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::snmp::data', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_snmp_host_spec.rb b/spec/defines/collectd_plugin_snmp_host_spec.rb index 04cf14d3f..3fd94b52d 100644 --- a/spec/defines/collectd_plugin_snmp_host_spec.rb +++ b/spec/defines/collectd_plugin_snmp_host_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::snmp::host', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_spec.rb b/spec/defines/collectd_plugin_spec.rb index 91b345e66..f762b88f4 100644 --- a/spec/defines/collectd_plugin_spec.rb +++ b/spec/defines/collectd_plugin_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_tail_file_spec.rb b/spec/defines/collectd_plugin_tail_file_spec.rb index 8dc09d1fc..99ad3235b 100644 --- a/spec/defines/collectd_plugin_tail_file_spec.rb +++ b/spec/defines/collectd_plugin_tail_file_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::tail::file', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_plugin_write_graphite_spec.rb b/spec/defines/collectd_plugin_write_graphite_spec.rb index 5dbf0bfef..763bada85 100644 --- a/spec/defines/collectd_plugin_write_graphite_spec.rb +++ b/spec/defines/collectd_plugin_write_graphite_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::plugin::write_graphite::carbon', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/defines/collectd_typesdb_spec.rb b/spec/defines/collectd_typesdb_spec.rb index 3ea7d3fd4..522f29447 100644 --- a/spec/defines/collectd_typesdb_spec.rb +++ b/spec/defines/collectd_typesdb_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'collectd::typesdb', type: :define do - on_supported_os.each do |os, facts| + on_supported_os(baseline_os_hash).each do |os, facts| context "on #{os} " do let :facts do facts diff --git a/spec/spec_helper_methods.rb b/spec/spec_helper_methods.rb index 91c4571ac..6163018e1 100644 --- a/spec/spec_helper_methods.rb +++ b/spec/spec_helper_methods.rb @@ -15,7 +15,7 @@ def os_specific_options(facts) end end -def test_on +def all_supported_os_hash { supported_os: [ { @@ -40,3 +40,14 @@ def test_on ] } end + +def baseline_os_hash + { + supported_os: [ + { + 'operatingsystem' => 'CentOS', + 'operatingsystemrelease' => ['7'] + } + ] + } +end