Skip to content

Commit 63ced3e

Browse files
author
Wilson McCoubrey
committed
[MODULES-4224] Implement beaker-module_install_helper
Gemfile updated by modulesync PR: puppetlabs/modulesync_configs#122
1 parent 8e30777 commit 63ced3e

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ group :system_tests do
5959
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4') if ! supports_windows
6060
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1') if supports_windows
6161
gem 'beaker-puppet_install_helper', :require => false
62+
gem 'beaker-module_install_helper', :require => false
6263
gem 'master_manipulator', :require => false
6364
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
6465
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')

spec/spec_helper_acceptance.rb

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
require 'beaker-rspec/spec_helper'
22
require 'beaker-rspec/helpers/serverspec'
33
require 'beaker/puppet_install_helper'
4+
require 'beaker/module_install_helper'
45

56
run_puppet_install_helper
7+
install_module_on(hosts)
8+
install_module_dependencies_on(hosts)
69

710
RSpec.configure do |c|
811
c.filter_run :focus => true
@@ -12,9 +15,6 @@
1215
c.filter_run_excluding :ipv6 => true
1316
end
1417

15-
# Project root
16-
proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
17-
1818
# Readable test descriptions
1919
c.formatter = :documentation
2020

@@ -42,11 +42,6 @@
4242

4343
# Install module and dependencies
4444
hosts.each do |host|
45-
copy_module_to(host, :source => proj_root, :module_name => 'apache')
46-
47-
on host, puppet('module','install','puppetlabs-stdlib')
48-
on host, puppet('module','install','puppetlabs-concat')
49-
5045
# Required for mod_passenger tests.
5146
if fact('osfamily') == 'RedHat'
5247
on host, puppet('module','install','stahnma/epel')

0 commit comments

Comments
 (0)