Skip to content

Commit dfd784e

Browse files
committed
test(kitchen): debian and ubuntu use different paths now
1 parent 07bb5b6 commit dfd784e

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

test/integration/default/controls/config_spec.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77

88
cfgfile =
99
case os[:name]
10+
when 'debian' then
11+
'/etc/openvpn/server/myserver1.conf'
1012
when 'fedora' then
1113
'/etc/openvpn/server/myserver1.conf'
14+
when 'ubuntu' then
15+
'/etc/openvpn/server/myserver1.conf'
1216
else
1317
'/etc/openvpn/myserver1.conf'
1418
end
@@ -23,7 +27,7 @@
2327
its('content') { should include 'user' }
2428
end
2529

26-
describe command('ls -l /etc/openvpn/myserver1.conf') do
30+
describe command("ls -l #{cfgfile}") do
2731
its('stdout') { should include " #{user} #{group} " }
2832
end
2933
end
@@ -33,8 +37,12 @@
3337

3438
cfgfile =
3539
case os[:name]
40+
when 'debian' then
41+
'/etc/openvpn/client/myclient1.conf'
3642
when 'fedora' then
3743
'/etc/openvpn/client/myclient1.conf'
44+
when 'ubuntu' then
45+
'/etc/openvpn/client/myclient1.conf'
3846
else
3947
'/etc/openvpn/myclient1.conf'
4048
end
@@ -49,7 +57,7 @@
4957
its('content') { should include 'user' }
5058
end
5159

52-
describe command('ls -l /etc/openvpn/myclient1.conf') do
60+
describe command("ls -l #{cfgfile}") do
5361
its('stdout') { should include " #{user} #{group} " }
5462
end
5563
end

test/integration/default/controls/services_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@
1515

1616
prefix =
1717
case os[:name]
18+
when 'debian' then
19+
"openvpn-#{role}"
1820
when 'fedora' then
1921
"openvpn-#{role}"
22+
when 'ubuntu' then
23+
"openvpn-#{role}"
2024
else
2125
'openvpn'
2226
end

0 commit comments

Comments
 (0)