Merge pull request #68 from baby-gnu/feature/older-debian-based-systems

feat(debian+ubuntu): improve support for older systems

Author: myii

libvirt/osfingermap.yaml

@@ -10,22 +10,7 @@
 # you will need to provide at least an empty dict in this file, e.g.
 # osfingermap: {}
 ---
-## os: Debian
-# Squeeze
-Debian-6:
-  libvirt_pkg: libvirt-bin
-  libvirt_service: libvirt-bin
-
-# Jessie
-Debian-8:
-  libvirt_pkg: libvirt-bin
-
-
 ## os: Ubuntu
-# Trusty
-Ubuntu-14.04:
-  libvirt_pkg: libvirt-bin
-  libvirt_service: libvirt-bin
 # Xenial
 Ubuntu-16.04:
   libvirt_pkg: libvirt-bin

test/integration/share/libraries/libvirt.rb

@@ -32,6 +32,26 @@ def daemon_config_dir
   end
 
   def daemon_config_file
-    inspec.file(File.join(daemon_config_dir, 'libvirtd'))
+    inspec.file(File.join(daemon_config_dir, service_name))
+  end
+
+  def service_name
+    case inspec.os[:name]
+    when 'ubuntu'
+      service_name_ubuntu
+
+    else
+      'libvirtd'
+    end
+  end
+
+  def service_name_ubuntu
+    case inspec.os[:release]
+    when /^16/
+      'libvirt-bin'
+
+    else
+      'libvirtd'
+    end
   end
 end

test/integration/share/libraries/libvirt_packages.rb

@@ -50,6 +50,9 @@ def build_os_name_packages
     when 'centos'
       build_centos_packages
 
+    when 'ubuntu'
+      build_ubuntu_packages
+
     else
       {}
     end
@@ -115,4 +118,13 @@ def build_centos_packages
       { 'python' => ['python3-libvirt'] }
     end
   end
+
+  def build_ubuntu_packages
+    case inspec.os[:release]
+    when /^16/
+      { 'libvirt' => ['libvirt-bin'] }
+    else
+      {}
+    end
+  end
 end

test/integration/share/libraries/libvirt_socket_admin.rb

@@ -14,10 +14,26 @@ class LibvirtSocketAdminResource < Inspec.resource(1)
   supports platform_name: 'opensuse'
 
   def initialize
+    if skipped_platform?
+      raise Inspec::Exceptions::ResourceSkipped, 'No admin socket on this platform'
+    end
+
     @file = inspec.file('/var/run/libvirt/libvirt-admin-sock')
     @systemd_status = inspec.systemd_config('libvirtd-admin.socket')
   end
 
+  def skipped_platform?
+    skipped_debian? || skipped_ubuntu?
+  end
+
+  def skipped_debian?
+    inspec.os[:name] == 'debian' && inspec.os[:release].match(/^8/)
+  end
+
+  def skipped_ubuntu?
+    inspec.os[:name] == 'ubuntu' && inspec.os[:release].match(/^16/)
+  end
+
   def config_owner
     if @systemd_status.active?
       @systemd_status.config('SocketUser') || 'root'