Merge pull request #872 from Phil-Friderici/new_facts

Use structured $facts hash syntax in spec tests

Author: evgeni

spec/classes/agent_spec.rb

@@ -16,7 +16,7 @@
 
   on_supported_os(baseline_os_hash).each do |os, facts|
     context "on #{os}" do
-      config_path = case facts[:operatingsystem]
+      config_path = case facts[:os]['name']
                     when 'Fedora'
                       '/etc/zabbix_agentd.conf'
                     when 'windows'
@@ -25,13 +25,13 @@
                       '/etc/zabbix/zabbix_agentd.conf'
                     end
 
-      log_path = case facts[:operatingsystem]
+      log_path = case facts[:os]['name']
                  when 'windows'
                    'C:/ProgramData/zabbix/zabbix_agentd.log'
                  else
                    '/var/log/zabbix/zabbix_agentd.log'
                  end
-      include_dir = case facts[:operatingsystem]
+      include_dir = case facts[:os]['name']
                     when 'windows'
                       'C:/ProgramData/zabbix/zabbix_agentd.d'
                     else
@@ -45,7 +45,7 @@
                          '6.0'
                        end
 
-      case facts[:osfamily]
+      case facts[:os]['family']
       when 'Gentoo'
         package_name = 'zabbix'
         service_name = 'zabbix-agentd'
@@ -56,12 +56,12 @@
         package_name = 'zabbix-agent'
         service_name = 'zabbix-agent'
       end
-      # package = facts[:osfamily] == 'Gentoo' ? 'zabbix' : 'zabbix-agent'
-      # service = facts[:osfamily] == 'Gentoo' ? 'zabbix-agentd' : 'zabbix-agent'
+      # package = facts[:os]['family'] == 'Gentoo' ? 'zabbix' : 'zabbix-agent'
+      # service = facts[:os]['family'] == 'Gentoo' ? 'zabbix-agentd' : 'zabbix-agent'
 
       context 'with all defaults' do
         # Make sure package will be installed, service running and ensure of directory.
-        if facts[:kernel] == 'windows'
+        if facts[:os]['name'] == 'windows'
           it do
             is_expected.to contain_package(package_name).with(
               ensure: '4.4.5',
@@ -81,7 +81,7 @@
             is_expected.to contain_service(service_name).
               with_ensure('running').
               with_enable(true).
-              with_service_provider(facts[:osfamily] == 'AIX' ? 'init' : nil).
+              with_service_provider(facts[:os]['family'] == 'AIX' ? 'init' : nil).
               that_requires(["Package[#{package_name}]", "Zabbix::Startup[#{service_name}]"])
           end
 
@@ -99,7 +99,7 @@
           }
         end
 
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Archlinux'
           it { is_expected.not_to compile.with_all_deps }
         when 'Debian'
@@ -216,7 +216,7 @@
 
       context 'it creates a startup script' do
         if facts[:kernel] == 'Linux'
-          case facts[:osfamily]
+          case facts[:os]['family']
           when 'Archlinux', 'Debian', 'Gentoo', 'RedHat'
             it { is_expected.to contain_file("/etc/init.d/#{service_name}").with_ensure('absent') }
             it { is_expected.to contain_file("/etc/systemd/system/#{service_name}.service").with_ensure('file') }
@@ -413,7 +413,7 @@
       end
 
       context 'when declaring manage_choco is false with zabbix_package_source specified' do
-        if facts[:kernel] == 'windows'
+        if facts[:os]['name'] == 'windows'
           let :params do
             {
               manage_choco: false,

spec/classes/database_spec.rb

@@ -18,7 +18,7 @@
       let :pre_condition do
         <<-EOS
           include 'postgresql::server'
-          if $::osfamily == 'Gentoo' {
+          if $facts['os']['family'] == 'Gentoo' {
             # We don't need the package to be installed as its the same for the server.
             class { 'mysql::client':
               package_manage => false,

spec/classes/javagateway_spec.rb

@@ -35,7 +35,7 @@
           }
         end
 
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Archlinux'
           it { is_expected.not_to compile }
         when 'RedHat'

spec/classes/sender_spec.rb

@@ -37,7 +37,7 @@
           }
         end
 
-        if %w[Archlinux Gentoo].include?(facts[:osfamily])
+        if %w[Archlinux Gentoo].include?(facts[:os]['family'])
           it { is_expected.not_to compile.with_all_deps }
         else
           it { is_expected.to contain_class('zabbix::repo').with_zabbix_version(zabbix_version) }

spec/classes/server_spec.rb

@@ -9,7 +9,7 @@
   end
 
   on_supported_os(baseline_os_hash).each do |os, facts|
-    next if facts[:osfamily] == 'Archlinux' # zabbix server is currently not supported on archlinux
+    next if facts[:os]['family'] == 'Archlinux' # zabbix server is currently not supported on archlinux
     next if facts[:os]['name'] == 'windows'
 
     context "on #{os}" do
@@ -28,7 +28,7 @@
         it { is_expected.to contain_zabbix__startup('zabbix-server') }
       end
 
-      if facts[:osfamily] == 'RedHat'
+      if facts[:os]['family'] == 'RedHat'
         describe 'with enabled selinux' do
           let :params do
             {
@@ -150,7 +150,7 @@
       end
 
       context 'it creates a startup script' do
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'Archlinux', 'Debian', 'Gentoo', 'RedHat'
           it { is_expected.to contain_file('/etc/init.d/zabbix-server').with_ensure('absent') }
           it { is_expected.to contain_file('/etc/systemd/system/zabbix-server.service').with_ensure('file') }

spec/classes/web_spec.rb

@@ -62,8 +62,8 @@
 
           pgsqlpackage = 'php-pgsql'
 
-          packages = if facts[:osfamily] == 'RedHat'
-                       if facts[:operatingsystemmajrelease].to_i == 7 &&
+          packages = if facts[:os]['family'] == 'RedHat'
+                       if facts[:os]['release']['major'].to_i == 7 &&
                           !%w[VirtuozzoLinux OracleLinux Scientific].include?(facts[:os]['name']) &&
                           Puppet::Util::Package.versioncmp(zabbix_version, '5.0') >= 0
                          %w[zabbix-web-pgsql-scl zabbix-web]
@@ -87,7 +87,7 @@
 
           mysqlpackage = 'php-mysql'
 
-          packages = facts[:osfamily] == 'RedHat' ? %w[zabbix-web-mysql zabbix-web] : ['zabbix-frontend-php', mysqlpackage]
+          packages = facts[:os]['family'] == 'RedHat' ? %w[zabbix-web-mysql zabbix-web] : ['zabbix-frontend-php', mysqlpackage]
           packages.each do |package|
             it { is_expected.to contain_package(package) }
           end

spec/defines/userparameters_spec.rb

@@ -11,8 +11,8 @@
       let(:title) { 'mysqld' }
       let(:pre_condition) { 'class { "zabbix::agent": include_dir => "/etc/zabbix/zabbix_agentd.d" }' }
 
-      package = facts[:osfamily] == 'Gentoo' ? 'zabbix' : 'zabbix-agent'
-      service = facts[:osfamily] == 'Gentoo' ? 'zabbix-agentd' : 'zabbix-agent'
+      package = facts[:os]['family'] == 'Gentoo' ? 'zabbix' : 'zabbix-agent'
+      service = facts[:os]['family'] == 'Gentoo' ? 'zabbix-agentd' : 'zabbix-agent'
 
       context 'with an content' do
         let(:params) { { content: 'UserParameter=mysql.ping,mysqladmin -uroot ping | grep -c alive' } }