Browse Source

test: standardise use of `share` suite & `_mapdata` state [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/302
tags/v3.0.1
Imran Iqbal 3 years ago
parent
commit
35a2124a43
No account linked to committer's email address
5 changed files with 8 additions and 4 deletions
  1. +1
    -1
      .rubocop.yml
  2. +1
    -1
      Gemfile
  3. +1
    -0
      test/integration/default/inspec.yml
  4. +1
    -0
      test/integration/share/inspec.yml
  5. +4
    -2
      test/integration/share/libraries/system.rb

+ 1
- 1
.rubocop.yml View File

# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
Max: 88 Max: 88
Metrics/BlockLength: Metrics/BlockLength:
ExcludedMethods:
IgnoredMethods:
- control - control
- describe - describe
# Increase from default of `25` # Increase from default of `25`

+ 1
- 1
Gemfile View File

# Use the latest version of `inspec` prior to `4.23.4`, which introduces a # Use the latest version of `inspec` prior to `4.23.4`, which introduces a
# regression where the diff isn't displayed when comparing using `eq`. # regression where the diff isn't displayed when comparing using `eq`.
gem 'inspec', '~> 4.22.22' gem 'inspec', '~> 4.22.22'
# Install the `kitchen-docker` gem from GitHub because the latest version
# Install the `kitchen-docker` gem using `git` because the latest version
# currently available (`2.10.0`) doesn't include a recent fix for Gentoo. # currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
# rubocop:disable Layout/LineLength # rubocop:disable Layout/LineLength
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'

+ 1
- 0
test/integration/default/inspec.yml View File

- platform-name: opensuse - platform-name: opensuse
- platform-name: suse - platform-name: suse
- platform-name: freebsd - platform-name: freebsd
- platform-name: openbsd
- platform-name: amazon - platform-name: amazon
- platform-name: oracle - platform-name: oracle
- platform-name: arch - platform-name: arch

+ 1
- 0
test/integration/share/inspec.yml View File

- platform-name: opensuse - platform-name: opensuse
- platform-name: suse - platform-name: suse
- platform-name: freebsd - platform-name: freebsd
- platform-name: openbsd
- platform-name: amazon - platform-name: amazon
- platform-name: oracle - platform-name: oracle
- platform-name: arch - platform-name: arch

+ 4
- 2
test/integration/share/libraries/system.rb View File

case inspec.platform[:name] case inspec.platform[:name]
when 'amazon', 'oracle' when 'amazon', 'oracle'
"#{inspec.platform[:name]}linux" "#{inspec.platform[:name]}linux"
when 'windows_8.1_pro', 'windows_server_2019_datacenter'
'windows'
when /^windows_/
inspec.platform[:family]
else else
inspec.platform[:name] inspec.platform[:name]
end end
'8.1' '8.1'
when 'windows_server_2019_datacenter' when 'windows_server_2019_datacenter'
'2019-server' '2019-server'
when 'windows_server_2016_datacenter'
'2016-server'
else else
inspec.platform[:release] inspec.platform[:release]
end end

Loading…
Cancel
Save