浏览代码

test: update for new platforms (inc. using `system` library)

tags/v1.8.1
Imran Iqbal 3 年前
父节点
当前提交
e6bcdc1b4d
没有帐户链接到提交者的电子邮件
共有 8 个文件被更改,包括 80 次插入26 次删除
  1. +13
    -4
      test/integration/v3000-py2/controls/pkgs_spec.rb
  2. +11
    -4
      test/integration/v3000-py2/controls/service_spec.rb
  3. +5
    -1
      test/integration/v3000-py3/controls/pkgs_spec.rb
  4. +3
    -1
      test/integration/v3000-py3/controls/service_spec.rb
  5. +13
    -4
      test/integration/v3001-py3/controls/pkgs_spec.rb
  6. +11
    -4
      test/integration/v3001-py3/controls/service_spec.rb
  7. +13
    -4
      test/integration/v3002-py3/controls/pkgs_spec.rb
  8. +11
    -4
      test/integration/v3002-py3/controls/service_spec.rb

+ 13
- 4
test/integration/v3000-py2/controls/pkgs_spec.rb 查看文件

@@ -1,14 +1,23 @@
# frozen_string_literal: true

pkgs =
case system.platform[:name]
when 'arch'
%w[salt]
when /bsd$/
%w[py37-salt-3002.6]
when 'windows'
%w[Salt\ Minion]
else
%w[salt-master salt-minion]
end

control 'salt packages' do
title 'should be installed'

version = '3000'

%w[
salt-master
salt-minion
].each do |p|
pkgs.each do |p|
describe package(p) do
it { should be_installed }
its('version') { should match(/^#{version}/) }

+ 11
- 4
test/integration/v3000-py2/controls/service_spec.rb 查看文件

@@ -1,12 +1,19 @@
# frozen_string_literal: true

services =
case system.platform[:family]
when 'bsd'
%w[salt_master salt_minion]
when 'windows'
%w[salt-minion]
else
%w[salt-master salt-minion]
end

control 'salt services' do
title 'should be running'

%w[
salt-master
salt-minion
].each do |p|
services.each do |p|
describe service(p) do
it { should be_installed }
it { should be_enabled }

+ 5
- 1
test/integration/v3000-py3/controls/pkgs_spec.rb 查看文件

@@ -1,7 +1,11 @@
# frozen_string_literal: true

pkgs =
case platform[:family]
case system.platform[:name]
when 'arch'
%w[salt]
when /bsd$/
%w[py37-salt-3002.6]
when 'windows'
%w[Salt\ Minion]
else

+ 3
- 1
test/integration/v3000-py3/controls/service_spec.rb 查看文件

@@ -1,7 +1,9 @@
# frozen_string_literal: true

services =
case platform[:family]
case system.platform[:family]
when 'bsd'
%w[salt_master salt_minion]
when 'windows'
%w[salt-minion]
else

+ 13
- 4
test/integration/v3001-py3/controls/pkgs_spec.rb 查看文件

@@ -1,14 +1,23 @@
# frozen_string_literal: true

pkgs =
case system.platform[:name]
when 'arch'
%w[salt]
when /bsd$/
%w[py37-salt-3002.6]
when 'windows'
%w[Salt\ Minion]
else
%w[salt-master salt-minion]
end

control 'salt packages' do
title 'should be installed'

version = '3001'

%w[
salt-master
salt-minion
].each do |p|
pkgs.each do |p|
describe package(p) do
it { should be_installed }
its('version') { should match(/^#{version}/) }

+ 11
- 4
test/integration/v3001-py3/controls/service_spec.rb 查看文件

@@ -1,12 +1,19 @@
# frozen_string_literal: true

services =
case system.platform[:family]
when 'bsd'
%w[salt_master salt_minion]
when 'windows'
%w[salt-minion]
else
%w[salt-master salt-minion]
end

control 'salt services' do
title 'should be running'

%w[
salt-master
salt-minion
].each do |p|
services.each do |p|
describe service(p) do
it { should be_installed }
it { should be_enabled }

+ 13
- 4
test/integration/v3002-py3/controls/pkgs_spec.rb 查看文件

@@ -1,14 +1,23 @@
# frozen_string_literal: true

pkgs =
case system.platform[:name]
when 'arch'
%w[salt]
when /bsd$/
%w[py37-salt-3002.6]
when 'windows'
%w[Salt\ Minion]
else
%w[salt-master salt-minion]
end

control 'salt packages' do
title 'should be installed'

version = '3002'

%w[
salt-master
salt-minion
].each do |p|
pkgs.each do |p|
describe package(p) do
it { should be_installed }
its('version') { should match(/^#{version}/) }

+ 11
- 4
test/integration/v3002-py3/controls/service_spec.rb 查看文件

@@ -1,12 +1,19 @@
# frozen_string_literal: true

services =
case system.platform[:family]
when 'bsd'
%w[salt_master salt_minion]
when 'windows'
%w[salt-minion]
else
%w[salt-master salt-minion]
end

control 'salt services' do
title 'should be running'

%w[
salt-master
salt-minion
].each do |p|
services.each do |p|
describe service(p) do
it { should be_installed }
it { should be_enabled }

正在加载...
取消
保存