X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Fspec%2Facceptance%2Fpolicy_spec.rb;fp=3rdparty%2Fmodules%2Frabbitmq%2Fspec%2Facceptance%2Fpolicy_spec.rb;h=26858ecc5047ef18c22d2be17ff6df9605f280e7;hb=24caa46729f80fbba4be8b9b26ebcb3acc4cb0fb;hp=91161a40edd28a22ca06221becfd0fb9fe36c7fc;hpb=c7e7bcc28cc5dc48a7e284a3c82f33df27d1f57d;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/spec/acceptance/policy_spec.rb b/3rdparty/modules/rabbitmq/spec/acceptance/policy_spec.rb
index 91161a40e..26858ecc5 100644
--- a/3rdparty/modules/rabbitmq/spec/acceptance/policy_spec.rb
+++ b/3rdparty/modules/rabbitmq/spec/acceptance/policy_spec.rb
@@ -1,16 +1,18 @@
 require 'spec_helper_acceptance'
 
 describe 'rabbitmq policy on a vhost:' do
-  context 'create policy resource' do
-    it 'runs successfully' do
+
+
+  context "create policy resource" do
+    it 'should run successfully' do
       pp = <<-EOS
-      if $facts['os']['family'] == 'RedHat' {
+      if $::osfamily == 'RedHat' {
         class { 'erlang': epel_enable => true }
-        Class['erlang'] -> Class['rabbitmq']
+        Class['erlang'] -> Class['::rabbitmq']
       }
-      class { 'rabbitmq':
+      class { '::rabbitmq':
         service_manage    => true,
-        port              => 5672,
+        port              => '5672',
         delete_guest_user => true,
         admin_enable      => true,
       } ->
@@ -28,33 +30,18 @@ describe 'rabbitmq policy on a vhost:' do
           'ha-sync-mode' => 'automatic',
         },
       }
-
-      rabbitmq_policy { 'eu-federation@myhost':
-        pattern    => '^eu\\.',
-        priority   => 0,
-        applyto    => 'all',
-        definition => {
-          'federation-upstream-set' => 'all',
-        },
-      }
       EOS
 
-      apply_manifest(pp, catch_failures: true)
-      apply_manifest(pp, catch_changes: true)
-
-      # Apply twice to ensure no changes the second time.
-      apply_manifest(pp, catch_failures: true)
-      expect(apply_manifest(pp, catch_changes: true).exit_code).to be_zero
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
     end
 
-    # rubocop:disable RSpec/MultipleExpectations
-    it 'has the policy' do
+    it 'should have the policy' do
       shell('rabbitmqctl list_policies -p myhost') do |r|
-        expect(r.stdout).to match(%r{myhost.*ha-all.*ha-sync-mode})
-        expect(r.stdout).to match(%r{myhost.*eu-federation})
+        expect(r.stdout).to match(/myhost.*ha-all.*ha-sync-mode/)
         expect(r.exit_code).to be_zero
       end
     end
-    # rubocop:enable RSpec/MultipleExpectations
+
   end
 end