test(kitchen): debian and ubuntu use different paths now

myii · Aug 27, 2019 · dfd784e · dfd784e
1 parent 07bb5b6
commit dfd784e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb
@@ -7,8 +7,12 @@
 
   cfgfile =
     case os[:name]
+    when 'debian' then
+      '/etc/openvpn/server/myserver1.conf'
     when 'fedora' then
       '/etc/openvpn/server/myserver1.conf'
+    when 'ubuntu' then
+      '/etc/openvpn/server/myserver1.conf'
     else
       '/etc/openvpn/myserver1.conf'
     end
@@ -23,7 +27,7 @@
     its('content') { should include 'user' }
   end
 
-  describe command('ls -l /etc/openvpn/myserver1.conf') do
+  describe command("ls -l #{cfgfile}") do
     its('stdout') { should include " #{user} #{group} " }
   end
 end
@@ -33,8 +37,12 @@
 
   cfgfile =
     case os[:name]
+    when 'debian' then
+      '/etc/openvpn/client/myclient1.conf'
     when 'fedora' then
       '/etc/openvpn/client/myclient1.conf'
+    when 'ubuntu' then
+      '/etc/openvpn/client/myclient1.conf'
     else
       '/etc/openvpn/myclient1.conf'
     end
@@ -49,7 +57,7 @@
     its('content') { should include 'user' }
   end
 
-  describe command('ls -l /etc/openvpn/myclient1.conf') do
+  describe command("ls -l #{cfgfile}") do
     its('stdout') { should include " #{user} #{group} " }
   end
 end
diff --git a/test/integration/default/controls/services_spec.rb b/test/integration/default/controls/services_spec.rb
@@ -15,8 +15,12 @@
 
       prefix =
         case os[:name]
+        when 'debian' then
+          "openvpn-#{role}"
         when 'fedora' then
           "openvpn-#{role}"
+        when 'ubuntu' then
+          "openvpn-#{role}"
         else
           'openvpn'
         end