saltstack-formulas/firewalld-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(share): standardise with latest changes [skip ci]

Browse Source 
* Automated using https://github.com/myii/ssf-formula/pull/288
This commit is contained in:
Imran Iqbal 2021-02-01 07:23:09 +00:00
parent 4d797fc01e
commit 7df88b9e89
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/share/README.md
View File

@ -13,9 +13,10 @@ The `system` library provides easy access to system dependent information:
- `system.platform`: based on `inspec.platform`, modify to values that are more consistent from a SaltStack perspective - `system.platform`: based on `inspec.platform`, modify to values that are more consistent from a SaltStack perspective
- `system.platform[:family]` provide a family name for Arch and Gentoo - `system.platform[:family]` provide a family name for Arch and Gentoo
- `system.platform[:name]` append `linux` to both `amazon` and `oracle`; ensure Windows platforms are resolved as simply `windows` - `system.platform[:name]` append `linux` to both `amazon` and `oracle`; ensure Windows platforms are resolved as simply `windows`
- `system.platform[:release]` tweak Arch, Amazon Linux, Gentoo and Windows: - `system.platform[:release]` tweak Arch, Amazon Linux, Gentoo, openSUSE and Windows:
- `Arch` is always `base-latest` - `Arch` is always `base-latest`
- `Amazon Linux` release `2018` is resolved as `1` - `Amazon Linux` release `2018` is resolved as `1`
- `Gentoo` release is trimmed to its major version number and then the init system is appended (i.e. `sysv` or `sysd`) - `Gentoo` release is trimmed to its major version number and then the init system is appended (i.e. `sysv` or `sysd`)
- `openSUSE` is resolved as `tumbleweed` if the `platform[:release]` is in date format
- `Windows` uses the widely-used release number (e.g. `8.1` or `2019-server`) in place of the actual system release version - `Windows` uses the widely-used release number (e.g. `8.1` or `2019-server`) in place of the actual system release version
- `system.platform[:finger]` is the concatenation of the name and the major release number (except for Ubuntu, which gives `ubuntu-20.04` for example) - `system.platform[:finger]` is the concatenation of the name and the major release number (except for Ubuntu, which gives `ubuntu-20.04` for example)

15
test/integration/share/libraries/system.rb
View File

@ -45,7 +45,7 @@ class SystemResource < Inspec.resource(1)
end end
end end
# rubocop:disable Metrics/MethodLength # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
def build_platform_release def build_platform_release
case inspec.platform[:name] case inspec.platform[:name]
when 'amazon' when 'amazon'
@ -55,6 +55,10 @@ class SystemResource < Inspec.resource(1)
'base-latest' 'base-latest'
when 'gentoo' when 'gentoo'
"#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}" "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
when 'opensuse'
# rubocop:disable Style/NumericLiterals,Layout/LineLength
inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]
# rubocop:enable Style/NumericLiterals,Layout/LineLength
when 'windows_8.1_pro' when 'windows_8.1_pro'
'8.1' '8.1'
when 'windows_server_2019_datacenter' when 'windows_server_2019_datacenter'
@ -63,15 +67,10 @@ class SystemResource < Inspec.resource(1)
inspec.platform[:release] inspec.platform[:release]
end end
end end
# rubocop:enable Metrics/MethodLength # rubocop:enable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
def derive_gentoo_init_system def derive_gentoo_init_system
case inspec.command('systemctl').exist? inspec.command('systemctl').exist? ? 'sysd' : 'sysv'
when true
'sysd'
else
'sysv'
end
end end
def build_platform_finger def build_platform_finger