diff options
author | Justin Stoller <justin.stoller@gmail.com> | 2014-05-22 11:23:45 -0700 |
---|---|---|
committer | Justin Stoller <justin.stoller@gmail.com> | 2014-05-22 11:23:45 -0700 |
commit | 76025ad1559a031efcaad25454dcd581d7a64b2d (patch) | |
tree | 1a6f544461b9747e290ee01b6df9960501ce1975 /Rakefile | |
parent | 2f875839afe843bd8a9f320d553fb3a28a7420f8 (diff) | |
parent | c2108b67f6349068ae897265b28a7242d230be1b (diff) | |
download | puppet-vcsrepo-76025ad1559a031efcaad25454dcd581d7a64b2d.tar.gz puppet-vcsrepo-76025ad1559a031efcaad25454dcd581d7a64b2d.tar.bz2 |
Merge pull request #147 from johnduarte/beaker_raketasks
Adjust Rake tasks for beaker testing
Diffstat (limited to 'Rakefile')
-rwxr-xr-x | Rakefile | 32 |
1 files changed, 19 insertions, 13 deletions
@@ -1,18 +1,18 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'rake' -task 'beaker:test',[:host,:type] => :set_beaker_variables do |t,args| +desc "Run beaker-rspec and beaker tests" +task 'beaker:test:all',[:host,:type] => ["rake:beaker:rspec:test", "rake:beaker:test"] do |t,args| +end +desc "Run beaker-rspec tests" +task 'beaker:rspec:test',[:host,:type] => [:set_beaker_variables] do |t,args| Rake::Task['beaker-rspec:test'].invoke(args) +end - if File.exists?('./acceptance') - Dir.chdir('./acceptance') - exec(build_beaker_command args) - Dir.chdir('../') - else - puts "No acceptance directory found, not running beaker tests" - end - +desc "Run beaker tests" +task 'beaker:test',[:host,:type] => [:set_beaker_variables] do |t,args| + sh(build_beaker_command args) end desc "Run beaker rspec tasks against pe" @@ -40,6 +40,9 @@ task :set_beaker_variables do |t,args| puts "Host to test #{ENV['BEAKER_set']}" end ENV['BEAKER_IS_PE'] = args[:type] == 'pe'? "true": "false" + if ENV['BEAKER_setfile'] + @hosts_config = ENV['BEAKER_setfile'] + end end def build_beaker_command(args) @@ -48,11 +51,14 @@ def build_beaker_command(args) if File.exists?("./.beaker-#{args[:type]}.cfg") cmd << "--options-file ./.beaker-#{args[:type]}.cfg" end - if File.exists?("config/#{args[:host]}.cfg") - cmd << "--hosts config/#{args[:host]}.cfg" + if File.exists?(@hosts_config) + cmd << "--hosts #{@hosts_config}" + end + if File.exists?('./spec/acceptance/beaker_helper.rb') + cmd << "--pre-suite ./spec/acceptance/beaker_helper.rb" end - if File.exists?("./tests") - cmd << "--tests ./tests" + if File.exists?("./spec/acceptance/beaker") + cmd << "--tests ./spec/acceptance/beaker" end cmd.join(" ") end |