(maint) Make unit tests pass

voxpupuli · Jun 22, 2017 · 88c8642 · 88c8642
1 parent b5d8713
commit 88c8642
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -139,15 +139,14 @@
           group                   => '0',
           mode                    => '0755',
           selinux_ignore_defaults => true,
-        } ->
-        file { '/etc/systemd/system/rabbitmq-server.service.d/limits.conf':
+        }
+        -> file { '/etc/systemd/system/rabbitmq-server.service.d/limits.conf':
           content => template('rabbitmq/rabbitmq-server.service.d/limits.conf'),
           owner   => '0',
           group   => '0',
           mode    => '0644',
-          notify  => Exec['rabbitmq-systemd-reload'],
         }
-        exec { 'rabbitmq-systemd-reload':
+        ~> exec { 'rabbitmq-systemd-reload':
           command     => '/bin/systemctl daemon-reload',
           notify      => Class['Rabbitmq::Service'],
           refreshonly => true,
@@ -176,9 +175,8 @@
           owner   => '0',
           group   => '0',
           mode    => '0644',
-          notify  => Exec['rabbitmq-systemd-reload'],
         }
-        exec { 'rabbitmq-systemd-reload':
+        ~> exec { 'rabbitmq-systemd-reload':
           command     => '/usr/bin/systemctl daemon-reload',
           notify      => Class['Rabbitmq::Service'],
           refreshonly => true,

diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
@@ -10,11 +10,14 @@
 def with_debian_facts
   let :facts do
     super().merge({
-      :lsbdistcodename  => 'squeeze',
-      :lsbdistid        => 'Debian',
-      :osfamily         => 'Debian',
-      :os               => { :name => 'Debian',
-                             :release => { :full => '6.0'} },
+      :operatingsystemmajrelease => '6',
+      :lsbdistcodename           => 'squeeze',
+      :lsbdistid                 => 'Debian',
+      :osfamily                  => 'Debian',
+      :os                        => {
+        :name    => 'Debian',
+        :release => { :full => '6.0'},
+      },
     })
   end
 end