Skip to content

Commit 477905e

Browse files
authored
Merge pull request #873 from ekohl/mocked-facts
Use mocked facts in tests
2 parents a6c0810 + 49e5c98 commit 477905e

File tree

4 files changed

+3
-28
lines changed

4 files changed

+3
-28
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source ENV['GEM_SOURCE'] || "https://rubygems.org"
22

33
group :test do
4-
gem 'voxpupuli-test', '~> 2.1', :require => false
4+
gem 'voxpupuli-test', '~> 2.2', :require => false
55
gem 'coveralls', :require => false
66
gem 'simplecov-console', :require => false
77
end

spec/classes/rabbitmq_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
describe 'rabbitmq' do
44
on_supported_os.each do |os, facts|
55
context "on #{os}" do
6-
systemd_facts = os_specific_facts(facts)
7-
facts = facts.merge(systemd_facts)
86
let :facts do
97
facts
108
end

spec/spec_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
require 'voxpupuli/test/spec_helper'
1414

15+
add_mocked_facts!
16+
1517
if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
1618
facts = YAML.safe_load(File.read(File.join(__dir__, 'default_module_facts.yml')))
1719
if facts

spec/spec_helper_local.rb

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,2 @@
11
add_custom_fact :rabbitmq_version, '3.6.1' # puppet-rabbitmq
22
add_custom_fact :erl_ssl_path, '/usr/lib64/erlang/lib/ssl-7.3.3.1/ebin' # puppet-rabbitmq
3-
4-
def os_specific_facts(facts)
5-
case facts[:os]['family']
6-
when 'Archlinux'
7-
{ service_provider: 'systemd', systemd: true }
8-
when 'Debian'
9-
case facts[:os]['release']['major']
10-
when '7'
11-
{ service_provider: 'sysv', systemd: false }
12-
when '14.04'
13-
{ service_provider: 'upstart', systemd: false }
14-
else
15-
{ service_provider: 'systemd', systemd: true }
16-
end
17-
when 'RedHat'
18-
case facts[:os]['release']['major']
19-
when '6'
20-
{ service_provider: 'sysv', systemd: false }
21-
else
22-
{ service_provider: 'systemd', systemd: true }
23-
end
24-
else
25-
{ service_provider: 'systemd', systemd: true }
26-
end
27-
end

0 commit comments

Comments
 (0)