From 4d083ab06c7ee884a2b9270106f08bf8c85e4c7c Mon Sep 17 00:00:00 2001 From: Yury Bushmelev Date: Sun, 3 Nov 2024 22:02:43 +0800 Subject: [PATCH] Drop outdated OSes from unit tests --- spec/acceptance/nspwan_spec.rb | 2 +- spec/defines/daemon_reload_spec.rb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/spec/acceptance/nspwan_spec.rb b/spec/acceptance/nspwan_spec.rb index 1442750f..d4ff6477 100644 --- a/spec/acceptance/nspwan_spec.rb +++ b/spec/acceptance/nspwan_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper_acceptance' describe 'systemd with manage_nspawn true' do - machinectl = (fact('os.name') == 'Debian') && %w[10 11].include?(fact('os.release.major')) ? '/bin/machinectl' : '/usr/bin/machinectl' + machinectl = (fact('os.name') == 'Debian') && (fact('os.release.major') == '11') ? '/bin/machinectl' : '/usr/bin/machinectl' context 'configure nspawn' do let(:manifest) do diff --git a/spec/defines/daemon_reload_spec.rb b/spec/defines/daemon_reload_spec.rb index 3288e12d..4a2f0528 100644 --- a/spec/defines/daemon_reload_spec.rb +++ b/spec/defines/daemon_reload_spec.rb @@ -26,11 +26,8 @@ case [facts[:os]['name'], facts[:os]['family'], facts[:os]['release']['major']] when %w[Debian Debian 11], ['Ubuntu', 'Debian', '20.04'], - %w[VirtuozzoLinux RedHat 7], %w[AlmaLinux RedHat 8], - %w[CentOS RedHat 7], %w[CentOS RedHat 8], - %w[RedHat RedHat 7], %w[RedHat RedHat 8], %w[Rocky RedHat 8], %w[OracleLinux RedHat 8]