Skip to content

Commit

Permalink
Fix acceptance tests running under Vagrant
Browse files Browse the repository at this point in the history
  • Loading branch information
garethr committed Jul 22, 2015
1 parent 7ab4113 commit d2b118e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
pkg
spec/fixtures
pkg
.bundle/
.vagrant
.yardoc
doc
*.swp
.ruby-version
log
Gemfile.lock
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source "http://rubygems.org"
source "https://rubygems.org"

group :test do
gem "rake"
Expand All @@ -15,11 +15,12 @@ end
group :development do
gem "travis"
gem "travis-lint"
gem "beaker", :git => 'https://github.com/puppetlabs/beaker.git'
gem "beaker", "2.13.0"
gem "beaker-puppet_install_helper", :require => false
gem "beaker-rspec"
gem "puppet-blacksmith"
gem "guard-rake"
gem "pry"
gem "yard"
#gem "vagrant-wrapper"
end
9 changes: 8 additions & 1 deletion spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
require 'beaker-rspec/spec_helper'
require 'beaker-rspec/helpers/serverspec'
require 'beaker/puppet_install_helper'
require 'pry'
require 'beaker/puppet_install_helper'

# this is a workaround for BKR-419. Beaker currently fails to
# install puppet on Ubuntu 14.04 after version 2.13.0. But
# install_puppet_on is used by puppet_install_helper
def install_puppet_on(hosts, opts = {})
install_puppet(opts)
end unless respond_to? :install_puppet_on

run_puppet_install_helper

Expand Down

0 comments on commit d2b118e

Please sign in to comment.