浏览代码

test(config): fix for Amazon Linux 2 & Oracle Linux 7/8

tags/v2.6.0
Imran Iqbal 3 年前
父节点
当前提交
ab39c8f7c3
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. +4
    -4
      test/integration/default/controls/config.rb
  2. +1
    -0
      test/integration/default/controls/service.rb

+ 4
- 4
test/integration/default/controls/config.rb 查看文件

@@ -3,12 +3,12 @@
server_available = '/etc/nginx/sites-available'
server_enabled = '/etc/nginx/sites-enabled'

# Override by OS
case os[:name]
when 'redhat', 'centos', 'fedora'
# Override by platform family
case platform[:family]
when 'redhat','fedora'
server_available = '/etc/nginx/conf.d'
server_enabled = '/etc/nginx/conf.d'
when 'opensuse'
when 'suse'
server_available = '/etc/nginx/vhosts.d'
server_enabled = '/etc/nginx/vhosts.d'
end

+ 1
- 0
test/integration/default/controls/service.rb 查看文件

@@ -2,6 +2,7 @@ control 'Nginx service' do
title 'should be running and enabled'

describe service('nginx') do
it { should be_installed }
it { should be_enabled }
it { should be_running }
end

正在加载...
取消
保存