Merge branch 'master' of https://github.com/wyrie/puppet-backuppc
diff --git a/.gitignore b/.gitignore
index 0e2a000..f18bf2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/metadata.json
+Gemfile.lock
+.bundle/
diff --git a/.travis.yml b/.travis.yml
index 6c2c82a..ba74c6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+bundler_args: --without system_tests
rvm:
- 1.8.7
- 1.9.3
diff --git a/Gemfile b/Gemfile
index 7c8ea9e..7d1591f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,15 +2,18 @@
group :development, :test do
gem 'rake', :require => false
- gem 'rspec-puppet', :require => false
+ gem 'rspec-puppet', '~> 2.x', :require => false
gem 'puppetlabs_spec_helper', :require => false
- gem 'serverspec', :require => false
- gem 'rspec-system', :require => false
- gem 'rspec-system-puppet', :require => false
- gem 'rspec-system-serverspec', :require => false
gem 'puppet-lint', :require => false
end
+group :system_tests do
+ gem 'beaker', '~>2.2.0', :require => false
+ gem 'beaker-rspec', :require => false
+ gem 'serverspec', :require => false
+ gem 'pry', :require => false unless RUBY_VERSION =~ /^1.8/
+end
+
if facterversion = ENV['FACTER_GEM_VERSION']
gem 'facter', facterversion, :require => false
else
diff --git a/manifests/client.pp b/manifests/client.pp
index 91cf502..6d4bcc5 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -216,7 +216,7 @@
$blackout_good_cnt = false,
$backups_disable = false,
$xfer_method = 'rsync',
- $xfer_loglevel = 1,
+ $xfer_loglevel = '1',
$smb_share_name = false,
$smb_share_username = false,
$smb_share_passwd = false,
diff --git a/spec/classes/backuppc_client_spec.rb b/spec/classes/backuppc_client_spec.rb
index 897ed70..0cfb780 100644
--- a/spec/classes/backuppc_client_spec.rb
+++ b/spec/classes/backuppc_client_spec.rb
@@ -4,18 +4,20 @@
describe 'On an unknown operating system' do
let(:facts) {{ :osfamily => 'Unknown' }}
- it { should raise_error(Puppet::Error, /is not supported by this module/) }
+ it 'should raise an error' do
+ expect { should compile }.to raise_error(/is not supported by this module/)
+ end
end
context "On Ubuntu" do
let(:facts) {{ :osfamily => 'Debian' }}
let(:params) {{ :backuppc_hostname => 'backuppc.test.com' }}
- it { should include_class("backuppc::params") }
+ it { should contain_class("backuppc::params") }
end
context "On RedHat" do
let(:facts) {{ :osfamily => 'RedHat' }}
let(:params) {{ :backuppc_hostname => 'backuppc.test.com' }}
- it { should include_class("backuppc::params") }
+ it { should contain_class("backuppc::params") }
end
end
diff --git a/spec/classes/backuppc_server_spec.rb b/spec/classes/backuppc_server_spec.rb
index d9b4643..ddf70bc 100644
--- a/spec/classes/backuppc_server_spec.rb
+++ b/spec/classes/backuppc_server_spec.rb
@@ -4,20 +4,22 @@
describe 'On an unknown operating system' do
let(:facts) {{ :osfamily => 'Unknown' }}
- it { should raise_error(Puppet::Error, /is not supported by this module/) }
+ it 'should raise an error' do
+ expect { should compile }.to raise_error(/is not supported by this module/)
+ end
end
context "On Ubuntu" do
let(:facts) {{ :osfamily => 'Debian' }}
let(:params) {{ :backuppc_password => 'test_password' }}
- it { should include_class("backuppc::params") }
+ it { should contain_class("backuppc::params") }
it { should contain_package('backuppc') }
end
context "On RedHat" do
let(:facts) {{ :osfamily => 'RedHat' }}
let(:params) {{ :backuppc_password => 'test_password' }}
- it { should include_class("backuppc::params") }
+ it { should contain_class("backuppc::params") }
it { should contain_package('BackupPC') }
end
end
