]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
skip bytecode test on oracle 7
authoradrianiurca <adrian.iurca@gmail.com>
Mon, 16 Nov 2020 13:20:01 +0000 (15:20 +0200)
committeradrianiurca <adrian.iurca@gmail.com>
Mon, 16 Nov 2020 13:33:11 +0000 (15:33 +0200)
spec/acceptance/firewall_attributes_exceptions_spec.rb
spec/spec_helper_acceptance_local.rb

index 03937a7c628f07fd301f47ae4fae4b6724494241..a107e53ac08e63555fed58122c05d71418da1afa 100644 (file)
@@ -19,7 +19,7 @@ describe 'firewall basics', docker: true do
   # Skipping those from which we know they would fail.
   describe 'bytecode property', unless: (os[:family] == 'redhat' && os[:release][0] <= '6') ||
                                         (os[:family] == 'sles' && os[:release][0..1] <= '11') ||
-                                        (os[:family] == 'oraclelinux' && os[:release][0] <= '7') ||
+                                        (get_os_name == 'oraclelinux' && os[:release][0] <= '7') ||
                                         (os[:family] == 'ubuntu') do
     describe 'bytecode' do
       context '4,48 0 0 9,21 0 1 6,6 0 0 1,6 0 0 0' do
index 6682c44ccbc380a9d9c12c6543786d8647155fed..66dfe5d6e437ec51d600ac33463bdab7aa050ea2 100644 (file)
@@ -43,6 +43,10 @@ def update_profile_file
   run_shell("sed -i '/mesg n || true/c\\test -t 0 && mesg n || true' ~/.profile")
 end
 
+def get_os_name # rubocop:disable Style/AccessorMethodName: Do not prefix reader method names with get_
+  run_shell('facter os.name').stdout.delete("\n").downcase
+end
+
 RSpec.configure do |c|
   c.before :suite do
     if os[:family] == 'debian' && os[:release].to_i == 10