Unverified Commit ebe70124 authored by Romain Tartière's avatar Romain Tartière
Browse files

Adjust CI unit tests after last commit

parent f10082ae

manifests/canonical.pp

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ define postfix::canonical ( 
    incl    => $_file,

    lens    => 'Postfix_Canonical.lns',

    changes => $changes,

    require => [Package['postfix'], Augeas::Lens['postfix_canonical']],

    require => Package['postfix'],

    notify  => Exec["generate ${_file}.${lookup_table_suffix}"],

  }

}

manifests/transport.pp

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ define postfix::transport ( 
    lens    => 'Postfix_Transport.lns',

    incl    => $_file,

    changes => $changes,

    require => Augeas::Lens['postfix_transport'],

  }



  if defined(Package['postfix']) {

manifests/virtual.pp

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ define postfix::virtual ( 
    incl    => $_file,

    lens    => 'Postfix_Virtual.lns',

    changes => $changes,

    require => Augeas::Lens['postfix_virtual'],

  }



  if defined(Package['postfix']) {

spec/classes/postfix_spec.rb

+0 −21
Original line number Diff line number Diff line
@@ -539,13 +539,6 @@ describe 'postfix' do 
          is_expected.to contain_class('postfix::satellite')

          is_expected.to contain_postfix__virtual('@foo.example.com').with(ensure: 'present', destination: 'root')

          is_expected.to contain_augeas('Postfix virtual - @foo.example.com')

          is_expected.to contain_class('postfix::augeas')

          is_expected.to contain_augeas__lens('postfix_virtual').with(

            ensure: 'present',

            lens_content: %r{Parses /etc/postfix/virtual},

            test_content: %r{Provides unit tests and examples for the <Postfix_Virtual> lens.},

            stock_since: '1.7.0'

          )

        end



        it 'configures all local email to be forwarded to $root_mail_recipient delivered through $relayhost' do
@@ -696,13 +689,6 @@ describe 'postfix' do 
        it 'updates the transport map' do

          is_expected.to contain_postfix__transport('local_relay').with_nexthop('[10.12.0.2]:9925')

          is_expected.to contain_augeas('Postfix transport - local_relay')

          is_expected.to contain_class('postfix::augeas')

          is_expected.to contain_augeas__lens('postfix_transport').with(

            ensure: 'present',

            lens_content: %r{Parses /etc/postfix/transport},

            test_content: %r{Provides unit tests and examples for the <Postfix_Transport> lens.},

            stock_since: '1.0.0'

          )

        end

      end
@@ -720,13 +706,6 @@ describe 'postfix' do 
        it 'updates the virtual map' do

          is_expected.to contain_postfix__virtual('someone@somedomain.tld').with_destination('internal@ourdomain.tld')

          is_expected.to contain_augeas('Postfix virtual - someone@somedomain.tld')

          is_expected.to contain_class('postfix::augeas')

          is_expected.to contain_augeas__lens('postfix_virtual').with(

            ensure: 'present',

            lens_content: %r{Parses /etc/postfix/virtual},

            test_content: %r{Provides unit tests and examples for the <Postfix_Virtual> lens.},

            stock_since: '1.7.0'

          )

        end

      end

spec/defines/postfix_transport_spec.rb

+0 −14
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ describe 'postfix::transport' do 
      end



      context 'when using default values' do

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



        it {

          is_expected.to contain_augeas('Postfix transport - foo').with(

            incl: postfix_transport_path,
@@ -84,8 +82,6 @@ describe 'postfix::transport' do 
          }

        end



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



        it {

          is_expected.to contain_augeas('Postfix transport - foo').with(

            incl: '/tmp/transport',
@@ -110,8 +106,6 @@ describe 'postfix::transport' do 
          }

        end



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



        it {

          is_expected.to contain_augeas('Postfix transport - foo').with(

            incl: '/tmp/transport',
@@ -136,8 +130,6 @@ describe 'postfix::transport' do 
          }

        end



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



        it {

          is_expected.to contain_augeas('Postfix transport - foo').with(

            incl: '/tmp/transport',
@@ -163,8 +155,6 @@ describe 'postfix::transport' do 
          }

        end



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



        it {

          is_expected.to contain_augeas('Postfix transport - foo').with(

            incl: '/tmp/transport',
@@ -190,8 +180,6 @@ describe 'postfix::transport' do 
          }

        end



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



        it {

          is_expected.to contain_augeas('Postfix transport - foo').with(

            incl: '/tmp/transport',
@@ -215,8 +203,6 @@ describe 'postfix::transport' do 
          }

        end



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



        it {

          is_expected.to contain_augeas('Postfix transport - foo').with(

            incl: postfix_transport_path,