Skip to content

Commit f2a82d7

Browse files
Merge pull request #950 from puppetlabs/skip_bytecode_test_oracle7
(IAC-1025) - skip bytecode test on oracle 7
2 parents 52accfb + c921036 commit f2a82d7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

spec/acceptance/firewall_attributes_exceptions_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# Skipping those from which we know they would fail.
2020
describe 'bytecode property', unless: (os[:family] == 'redhat' && os[:release][0] <= '6') ||
2121
(os[:family] == 'sles' && os[:release][0..1] <= '11') ||
22-
(os[:family] == 'oraclelinux' && os[:release][0] <= '7') ||
22+
(fetch_os_name == 'oraclelinux' && os[:release][0] <= '7') ||
2323
(os[:family] == 'ubuntu') do
2424
describe 'bytecode' do
2525
context '4,48 0 0 9,21 0 1 6,6 0 0 1,6 0 0 0' do

spec/spec_helper_acceptance_local.rb

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ def update_profile_file
4343
run_shell("sed -i '/mesg n || true/c\\test -t 0 && mesg n || true' ~/.profile")
4444
end
4545

46+
def fetch_os_name
47+
@facter_os_name ||= run_shell('facter os.name').stdout.delete("\n").downcase
48+
end
49+
4650
RSpec.configure do |c|
4751
c.before :suite do
4852
if os[:family] == 'debian' && os[:release].to_i == 10

0 commit comments

Comments
 (0)