From 155eca5b9e052b75d2c083e45232c2b9e31115dc Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Sun, 14 Sep 2014 13:56:06 -0700 Subject: [PATCH] remove rspec-system support --- .nodeset.yml | 15 -------------- Gemfile | 12 ++++------- Rakefile | 1 - spec/spec_helper_system.rb | 26 ----------------------- spec/system/smartd_spec.rb | 42 -------------------------------------- 5 files changed, 4 insertions(+), 92 deletions(-) delete mode 100644 .nodeset.yml delete mode 100644 spec/spec_helper_system.rb delete mode 100644 spec/system/smartd_spec.rb diff --git a/.nodeset.yml b/.nodeset.yml deleted file mode 100644 index cb5c198..0000000 --- a/.nodeset.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -default_set: 'centos-64-x64' -sets: - 'centos-64-x64': - nodes: - 'main.vm': - prefab: 'centos-64-x64' - 'debian-607-x64': - nodes: - 'main.vm': - prefab: 'debian-607-x64' - 'ubuntu-server-12042-x64': - nodes: - "main.vm": - prefab: 'ubuntu-server-12042-x64' diff --git a/Gemfile b/Gemfile index 3cd5087..f22caae 100644 --- a/Gemfile +++ b/Gemfile @@ -6,13 +6,9 @@ else gem 'puppet', :require => false end -gem 'rake', :require => false -gem 'puppetlabs_spec_helper', :require => false -gem 'puppet-lint', :require => false -gem 'puppet-syntax', :require => false -gem 'rspec-system', :require => false -gem 'rspec-system-puppet', :require => false -gem 'rspec-system-serverspec', '>= 2.0.1', :require => false -gem 'serverspec', :require => false +gem 'rake', :require => false +gem 'puppetlabs_spec_helper', :require => false +gem 'puppet-lint', :require => false +gem 'puppet-syntax', :require => false # vim:ft=ruby diff --git a/Rakefile b/Rakefile index af17dd6..716947b 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,6 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-syntax/tasks/puppet-syntax' require 'puppet-lint/tasks/puppet-lint' -require 'rspec-system/rake_task' PuppetLint.configuration.send("disable_class_inherits_from_params_class") PuppetLint.configuration.ignore_paths = [ diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb deleted file mode 100644 index a05bd03..0000000 --- a/spec/spec_helper_system.rb +++ /dev/null @@ -1,26 +0,0 @@ -require 'rspec-system/spec_helper' -require 'rspec-system-puppet/helpers' -require 'rspec-system-serverspec/helpers' - -include RSpecSystemPuppet::Helpers - -RSpec.configure do |c| - # Project root - proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) - - # Enable colour - c.tty = true - - c.include RSpecSystemPuppet::Helpers - - # This is where we 'setup' the nodes before running our tests - c.before :suite do - # Install puppet - puppet_install - - # Install modules and dependencies - puppet_module_install(:source => proj_root, :module_name => 'smartd') - shell('puppet module install puppetlabs-stdlib') - shell('puppet module install csail-shell_config') - end -end diff --git a/spec/system/smartd_spec.rb b/spec/system/smartd_spec.rb deleted file mode 100644 index 697c622..0000000 --- a/spec/system/smartd_spec.rb +++ /dev/null @@ -1,42 +0,0 @@ -require 'spec_helper_system' - -describe 'smartd class' do - case node.facts['osfamily'] - when 'RedHat', 'Debian' - package_name = 'smartmontools' - service_name = 'smartd' - end - - describe 'running puppet code' do - # Using puppet_apply as a helper - it 'should work with no errors' do - pp = <<-EOS - class { 'smartd': } - EOS - - # Run it twice and test for idempotency - puppet_apply(pp) do |r| - r.exit_code.should_not == 1 - r.refresh - r.exit_code.should be_zero - end - end - end - - describe package(package_name) do - it { should be_installed } - end - - describe service(service_name) do - it { should be_running } - it { should be_enabled } - end - - describe file('/etc/smartd.conf') do - it { should be_file } - it { should contain([ - 'DEFAULT -m root -M daily', - 'DEVICESCAN', - ]) } - end -end