Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modulesync 7.0.0 #667

Merged
merged 3 commits into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
with:

```sh
BEAKER_setfile=debian11-64 bundle exec rake beaker
BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
```

You can replace the string `debian10` with any common operating system.
You can replace the string `debian11` with any common operating system.
The following strings are known to work:

* ubuntu1804
* ubuntu2004
* debian10
* ubuntu2204
* debian11
* centos7
* centos8
* centos9
* almalinux8
* almalinux9
* fedora36

For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).

Expand Down
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '6.0.0'
modulesync_config_version: '7.0.0'
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 6.0', :require => false
gem 'voxpupuli-test', '~> 7.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 3.0', :require => false
Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
add_custom_fact name.to_sym, value
end
end
Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

require 'voxpupuli/acceptance/spec_helper_acceptance'

configure_beaker
configure_beaker(modules: :metadata)

Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }
8 changes: 5 additions & 3 deletions spec/unit/facter/pip_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Facter.clear
end

# rubocop:disable RSpec/IndexedLet
let(:pip_version_output) do
<<~EOS
pip 6.0.6 from /opt/boxen/homebrew/Cellar/python/2.7.9/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/pip-6.0.6-py2.7.egg (python 2.7)
Expand All @@ -24,6 +25,7 @@
pip 18.1 from /usr/lib/python3/dist-packages/pip (python 3.7)
EOS
end
# rubocop:enable RSpec/IndexedLet

describe 'pip_version' do
context 'returns pip version when pip present' do
Expand All @@ -37,7 +39,7 @@
context 'returns nil when pip not present' do
it do
allow(Facter::Util::Resolution).to receive(:which).with('pip').and_return(false)
expect(Facter.value(:pip_version)).to eq(nil)
expect(Facter.value(:pip_version)).to be_nil
end
end
end
Expand All @@ -54,7 +56,7 @@
context 'returns nil when pip2 not present' do
it do
allow(Facter::Util::Resolution).to receive(:which).with('pip2').and_return(false)
expect(Facter.value(:pip2_version)).to eq(nil)
expect(Facter.value(:pip2_version)).to be_nil
end
end
end
Expand All @@ -71,7 +73,7 @@
context 'returns nil when pip3 not present' do
it do
allow(Facter::Util::Resolution).to receive(:which).with('pip3').and_return(false)
expect(Facter.value(:pip3_version)).to eq(nil)
expect(Facter.value(:pip3_version)).to be_nil
end
end
end
Expand Down
10 changes: 6 additions & 4 deletions spec/unit/facter/python_release_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Facter.clear
end

# rubocop:disable RSpec/IndexedLet
let(:python2_version_output) do
<<~EOS
Python 2.7.9
Expand All @@ -17,6 +18,7 @@
Python 3.3.0
EOS
end
# rubocop:enable RSpec/IndexedLet

describe 'python_release' do
context 'returns Python release when `python` present' do
Expand All @@ -31,7 +33,7 @@
it do
allow(Facter::Util::Resolution).to receive(:exec).and_return(false)
allow(Facter::Util::Resolution).to receive(:which).with('python').and_return(false)
expect(Facter.value(:python_release)).to eq(nil)
expect(Facter.value(:python_release)).to be_nil
end
end
end
Expand Down Expand Up @@ -60,15 +62,15 @@
allow(Facter::Util::Resolution).to receive(:which).with('python').and_return(true)
allow(Facter::Util::Resolution).to receive(:exec).with('python -V 2>&1').and_return(python3_version_output)
allow(Facter::Util::Resolution).to receive(:which).with('python2').and_return(false)
expect(Facter.value(:python2_release)).to eq(nil)
expect(Facter.value(:python2_release)).to be_nil
end
end

context 'returns nil when `python2` and `python` are absent' do
it do
allow(Facter::Util::Resolution).to receive(:which).with('python').and_return(false)
allow(Facter::Util::Resolution).to receive(:which).with('python2').and_return(false)
expect(Facter.value(:python2_release)).to eq(nil)
expect(Facter.value(:python2_release)).to be_nil
end
end
end
Expand All @@ -85,7 +87,7 @@
context 'returns nil when `python3` not present' do
it do
allow(Facter::Util::Resolution).to receive(:which).with('python3').and_return(false)
expect(Facter.value(:python3_release)).to eq(nil)
expect(Facter.value(:python3_release)).to be_nil
end
end
end
Expand Down
10 changes: 6 additions & 4 deletions spec/unit/facter/python_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Facter.clear
end

# rubocop:disable RSpec/IndexedLet
let(:python2_version_output) do
<<~EOS
Python 2.7.9
Expand All @@ -17,6 +18,7 @@
Python 3.3.0
EOS
end
# rubocop:enable RSpec/IndexedLet

describe 'python_version' do
context 'returns Python version when `python` present' do
Expand All @@ -30,7 +32,7 @@
context 'returns nil when `python` not present' do
it do
allow(Facter::Util::Resolution).to receive(:which).with('python').and_return(false)
expect(Facter.value(:python_version)).to eq(nil)
expect(Facter.value(:python_version)).to be_nil
end
end
end
Expand Down Expand Up @@ -59,15 +61,15 @@
allow(Facter::Util::Resolution).to receive(:which).with('python').and_return(true)
allow(Facter::Util::Resolution).to receive(:exec).with('python -V 2>&1').and_return(python3_version_output)
allow(Facter::Util::Resolution).to receive(:which).with('python2').and_return(false)
expect(Facter.value(:python2_version)).to eq(nil)
expect(Facter.value(:python2_version)).to be_nil
end
end

context 'returns nil when `python2` and `python` are absent' do
it do
allow(Facter::Util::Resolution).to receive(:which).with('python2').and_return(false)
allow(Facter::Util::Resolution).to receive(:which).with('python').and_return(false)
expect(Facter.value(:python2_version)).to eq(nil)
expect(Facter.value(:python2_version)).to be_nil
end
end
end
Expand All @@ -84,7 +86,7 @@
context 'returns nil when `python3` not present' do
it do
allow(Facter::Util::Resolution).to receive(:which).with('python3').and_return(false)
expect(Facter.value(:python3_version)).to eq(nil)
expect(Facter.value(:python3_version)).to be_nil
end
end
end
Expand Down