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.

Sign up for GitHub

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

Jump to bottom

(maint) Make spec tests pass on windows #665

Merged
merged 1 commit into from
Sep 5, 2023
Merged

(maint) Make spec tests pass on windows #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
$wait_for_pxp_agent_exit = undef,
$wait_for_puppet_run = undef,
Array[Puppet_agent::Config] $config = [],
$version_file_path = $facts['os']['family'] ? { 'windows' => "${facts['env_windows_installdir']}\\VERSION", default => '/opt/puppetlabs/puppet/VERSION' }
) inherits ::puppet_agent::params {
# The configure class uses $puppet_agent::config to manage settings in
# puppet.conf, and will always be present. It does not require management of
Expand Down Expand Up @@ -161,7 +162,7 @@
# The AIO package version and Puppet version can, on rare occasion, diverge.
# This logic checks for the AIO version of the server, since that's what the package manager cares about.
if $package_version == 'auto' {
$master_or_package_version = chomp(file('/opt/puppetlabs/puppet/VERSION'))
$master_or_package_version = chomp(file($version_file_path))
} else {
$master_or_package_version = $package_version
}
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/class_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
context 'default parameters in apply' do
before(:all) do
setup_puppet_on default
pp = "class { 'puppet_agent': package_version => 'auto'}"
pp = "class { 'puppet_agent': package_version => 'auto', collection => #{PUPPET_COLLECTION}}"
apply_manifest(pp, catch_failures: true)
end
after(:all) { teardown_puppet_on default }
Expand Down
6 changes: 6 additions & 0 deletions spec/classes/puppet_agent_osfamily_windows_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

let(:params) { { package_version: package_version } }
let(:version_file) { '/opt/puppetlabs/puppet/VERSION' }
let(:windows_version_file) { 'C:\Program Files\Puppet Labs\Puppet\VERSION' }

before(:each) do
# Need to mock the PE functions
Expand All @@ -15,10 +16,13 @@

allow(Puppet::Util).to receive(:absolute_path?).and_call_original
allow(Puppet::Util).to receive(:absolute_path?).with(version_file).and_return true
allow(Puppet::Util).to receive(:absolute_path?).with(windows_version_file).and_return true
allow(Puppet::FileSystem).to receive(:exist?).and_call_original
allow(Puppet::FileSystem).to receive(:read_preserve_line_endings).and_call_original
allow(Puppet::FileSystem).to receive(:exist?).with(version_file).and_return true
allow(Puppet::FileSystem).to receive(:exist?).with(windows_version_file).and_return true
allow(Puppet::FileSystem).to receive(:read_preserve_line_endings).with(version_file).and_return "1.10.100\n"
allow(Puppet::FileSystem).to receive(:read_preserve_line_endings).with(windows_version_file).and_return "1.10.100\n"
end

[['x64', 'x86_64'], ['x86', 'i386']].each do |arch, tag|
Expand Down Expand Up @@ -65,6 +69,7 @@
aio_agent_version: '1.0.0',
clientcert: 'foo.example.vm',
env_temp_variable: 'C:/tmp',
env_windows_installdir: windows_version_file.chomp('\VERSION'),
is_pe: true,
os: {
architecture: arch,
Expand Down Expand Up @@ -104,6 +109,7 @@
clientcert: 'foo.example.vm',
env_temp_variable: 'C:/tmp',
is_pe: true,
env_windows_installdir: windows_version_file.chomp('\VERSION'),
fips_enabled: true,
os: {
architecture: arch,
Expand Down
5 changes: 3 additions & 2 deletions spec/spec_helper_acceptance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def stop_firewall_on(host)
# Project root
PROJ_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
TEST_FILES = File.expand_path(File.join(File.dirname(__FILE__), 'acceptance', 'files'))
PUPPET_COLLECTION = 'puppet7'.freeze

def install_modules_on(host)
install_ca_certs_on(host)
Expand All @@ -37,7 +38,7 @@ def install_modules_on(host)
master['puppetservice'] = 'puppetserver'
master['puppetserver-confdir'] = '/etc/puppetlabs/puppetserver/conf.d'
master['type'] = 'aio'
install_puppet_agent_on master, { version: ENV['PUPPET_CLIENT_VERSION'] || '7.23.0', puppet_collection: 'puppet7' }
install_puppet_agent_on master, { version: ENV['PUPPET_CLIENT_VERSION'] || '7.23.0', puppet_collection: PUPPET_COLLECTION }
install_modules_on master
stop_firewall_on master
end
Expand Down Expand Up @@ -71,7 +72,7 @@ def setup_puppet_on(host, opts = {})

puts "Setup aio puppet on #{host}"
configure_type_defaults_on host
install_puppet_agent_on host, { version: ENV['PUPPET_CLIENT_VERSION'] || '7.23.0', puppet_collection: 'puppet7' }
install_puppet_agent_on host, { version: ENV['PUPPET_CLIENT_VERSION'] || '7.23.0', puppet_collection: PUPPET_COLLECTION }

puppet_opts = agent_opts(master.to_s)
if %r{windows}i.match?(host['platform'])
Expand Down
Loading