Skip to content

Commit 636f999

Browse files
committed
Update serverspec testing with correct OS's for systemd
1 parent c40e8a7 commit 636f999

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

test/integration/helpers/serverspec/redisio_examples.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
shared_examples_for 'redis on port' do |redis_port, _args|
22
it 'enables the redis service' do
3-
service_name = if os[:family] == 'redhat' && os[:release][0] == '7'
3+
service_name = if (os[:family] == 'redhat' && os[:release][0] == '7') ||
4+
(os[:family] == 'ubuntu' && os[:release].to_f >= 16.04) ||
5+
(os[:family] == 'debian' && os[:release].to_f >= 8.0)
46
"redis@#{redis_port}"
57
else
68
"redis#{redis_port}"

test/integration/helpers/serverspec/sentinel_examples.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
shared_examples_for 'sentinel on port' do |redis_port, redis_cluster_name, _args|
22
it 'enables the redis-sentinel service' do
33
redis_cluster_name ||= 'mycluster'
4-
name = if os[:family] == 'redhat' && os[:release][0] == '7'
4+
name = if (os[:family] == 'redhat' && os[:release][0] == '7') ||
5+
(os[:family] == 'ubuntu' && os[:release].to_f >= 16.04) ||
6+
(os[:family] == 'debian' && os[:release].to_f >= 8.0)
57
"redis-sentinel@#{redis_cluster_name}"
68
else
79
"redis_sentinel_#{redis_cluster_name}"

test/integration/multisentinel/serverspec/multiple_sentinels_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@
3636
end
3737
end
3838

39-
unless (os[:family] == 'redhat' && os[:release][0] == '7') || os[:family] == 'freebsd'
39+
unless (os[:family] == 'redhat' && os[:release][0] == '7') ||
40+
os[:family] == 'freebsd' ||
41+
(os[:family] == 'ubuntu' && os[:release].to_f >= 16.04) ||
42+
(os[:family] == 'debian' && os[:release].to_f >= 8.0)
4043
describe file('/etc/init.d/redis_sentinel_cluster') do
4144
[
4245
%r{SENTINELNAME=sentinel_cluster},

0 commit comments

Comments
 (0)