Unverified Commit 3e678a97 authored by Marcus Poller's avatar Marcus Poller
Browse files

RHEL8 and RHEL9 suffer from a running Postfix. If we disable Postfix before... 

RHEL8 and RHEL9 suffer from a running Postfix. If we disable Postfix before executing the test suite, we will reach idempotency one OpenVox run faster.
parent 71582238

REFERENCE.md

+0 −1
Changes for REFERENCE.md: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1310,4 +1310,3 @@ Returns: `Enum['cdb','dir','lmdb','db']` The file extension of the table type 
Data type: `String[1]`



The table type to report on

data/osfamily/RedHat/6.yaml

deleted100644 → 0
+0 −5
Changes for data/osfamily/RedHat/6.yaml: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line 
---



postfix::params::mailx_package: 's-nail'

postfix::ldap_packages: ['postfix-ldap']

postfix::params::restart_cmd: '/etc/init.d/postfix reload'

spec/acceptance/postfix_spec.rb

+4 −2
Changes for spec/acceptance/postfix_spec.rb: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -27,9 +27,11 @@ describe 'postfix class' do 
        }

      EOS



      # RHEL8 and RHEL9 have postfix running, therefore idempotency takes 3 OpenVox runs

      shell('systemctl stop postfix || true')

      # Run it twice and test for idempotency

      apply_manifest(pp, catch_failures: true)

      apply_manifest(pp, catch_changes: true)

      apply_manifest(pp, catch_failures: true, debug: false)

      apply_manifest(pp, catch_changes: true, debug: false)

    end



    describe package('postfix') do

spec/classes/postfix_spec.rb

+6 −6
Changes for spec/classes/postfix_spec.rb: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ describe 'postfix' do 
        it { is_expected.to contain_class('postfix::packages') }

        it { is_expected.to contain_class('postfix::params') }

        it { is_expected.to contain_class('postfix::service') }

        it { is_expected.to contain_exec('restart postfix after packages install') }

        it { is_expected.to contain_service('postfix') }



        case [facts[:os]['family'], facts[:os]['release']['major']]

        when %w[RedHat 10]
@@ -85,7 +85,7 @@ describe 'postfix' do 
              ensure: 'running',

              enable: 'true',

              hasstatus: 'true',

              restart: '/usr/bin/systemctl reload postfix'

              restart: '/usr/bin/systemctl reload postfix',

            )

          }

        end
@@ -112,7 +112,7 @@ describe 'postfix' do 
                ensure: 'running',

                enable: 'true',

                hasstatus: 'true',

                restart: '/usr/bin/systemctl reload postfix'

                restart: '/usr/bin/systemctl reload postfix',

              )

            }

          end
@@ -125,7 +125,7 @@ describe 'postfix' do 
                ensure: 'running',

                enable: 'true',

                hasstatus: 'true',

                restart: '/usr/bin/systemctl reload postfix'

                restart: '/usr/bin/systemctl reload postfix',

              )

            }

          end
@@ -152,7 +152,7 @@ describe 'postfix' do 
              ensure: 'running',

              enable: 'true',

              hasstatus: 'true',

              restart: '/usr/bin/systemctl reload postfix'

              restart: '/usr/bin/systemctl reload postfix',

            )

          }

        end
@@ -235,7 +235,7 @@ describe 'postfix' do 
              ensure: 'running',

              enable: 'true',

              hasstatus: 'true',

              restart: '/usr/bin/systemctl reload postfix'

              restart: '/usr/bin/systemctl reload postfix',

            )

          }