Merge pull request redhat-openstack#256 from txaj/release_3_3_0_fix

Fix tests

.fixtures.yml

@@ -4,6 +4,6 @@ fixtures:
       repo: 'git://github.com/puppetlabs/puppetlabs-stdlib'
     concat:
       repo: 'git://github.com/puppetlabs/puppetlabs-concat'
-      ref: '1.2.0'
+      ref: '1.2.1'
   symlinks:
     'collectd': "#{source_dir}"

spec/classes/collectd_init_spec.rb

@@ -30,7 +30,7 @@
    end
 
    it 'should fail' do
-     expect { subject }.to  raise_error(/foo is not supported/)
+     should compile.and_raise_error(/foo is not supported/)
    end
  end
 

spec/classes/collectd_plugin_disk_spec.rb

@@ -35,7 +35,7 @@
       {:disks => 'sda'}
     end
     it 'Will raise an error about :disks being a String' do
-      expect {should}.to raise_error(Puppet::Error,/String/)
+      should compile.and_raise_error(/String/)
     end
   end
 end

spec/classes/collectd_plugin_filecount_spec.rb

@@ -57,7 +57,7 @@
       {:directories => '/var/spool/postfix/active'}
     end
     it 'Will raise an error about :directories being a String' do
-      expect {should}.to raise_error(Puppet::Error,/String/)
+      should compile.and_raise_error(/String/)
     end
   end
 end

spec/classes/collectd_plugin_interface_spec.rb

@@ -35,7 +35,7 @@
       {:interfaces => 'eth0'}
     end
     it 'Will raise an error about :interfaces being a String' do
-      expect {should}.to raise_error(Puppet::Error,/String/)
+      should compile.and_raise_error(/String/)
     end
   end
 end

spec/classes/collectd_plugin_iptables_spec.rb

@@ -35,7 +35,7 @@
       {:chains => ['nat','In_SSH']}
     end
     it 'Will raise an error about :chains being an Array' do
-      expect {should}.to raise_error(Puppet::Error,/Array/)
+      should compile.and_raise_error(/Array/)
     end
   end
 end

spec/classes/collectd_plugin_irq_spec.rb

@@ -35,7 +35,7 @@
       {:irqs => '90,91,92'}
     end
     it 'Will raise an error about :irqs being a String' do
-      expect {should}.to raise_error(Puppet::Error,/String/)
+      should compile.and_raise_error(/String/)
     end
   end
 end

spec/classes/collectd_plugin_tcpconns_spec.rb

@@ -48,7 +48,7 @@
       {:localports => '22'}
     end
     it 'Will raise an error about :localports being a String' do
-      expect {should}.to raise_error(Puppet::Error,/String/)
+      should compile.and_raise_error(/String/)
     end
   end
 
@@ -57,7 +57,7 @@
       {:remoteports => '22'}
     end
     it 'Will raise an error about :remoteports being a String' do
-      expect {should}.to raise_error(Puppet::Error,/String/)
+      should compile.and_raise_error(/String/)
     end
   end
 end

spec/classes/collectd_plugin_unixsock_spec.rb

@@ -32,7 +32,7 @@
       {:socketfile => 'var/run/socket'}
     end
     it 'Will raise an error about :socketfile' do
-      expect {should}.to raise_error(Puppet::Error,/absolute path/)
+      should compile.and_raise_error(/absolute path/)
     end
   end
 end