From 61859ddce24cedc727ca3918b0094226aa943b15 Mon Sep 17 00:00:00 2001 From: tvpartytonight Date: Wed, 30 Aug 2023 09:44:53 -0700 Subject: [PATCH] (maint) Initially manage puppet before testing This changes the class_spec to initally manage puppet; puppet 7 and puppet 8 both are not enabled or running after installation, so there could be a bug in the initscripts somewhere or this was never actually a feature but a bug in how the tests were run. --- spec/acceptance/class_spec.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 17bdd148..ab023b91 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -3,7 +3,11 @@ describe 'puppet_agent class' do context 'default parameters in apply' do - before(:all) { setup_puppet_on default } + before(:all) do + setup_puppet_on default + pp = "class { 'puppet_agent': package_version => 'auto'}" + apply_manifest(pp, catch_failures: true) + end after(:all) { teardown_puppet_on default } describe package(package_name(default)) do @@ -18,6 +22,7 @@ end else describe service('puppet') do + it { is_expected.to be_enabled } it { is_expected.to be_running } end @@ -34,9 +39,6 @@ describe 'manage_repo parameter' do context 'when true (default)' do it 'creates repo config' do - pp = "class { 'puppet_agent': }" - apply_manifest(pp, catch_failures: true) - wait_for_finish_on default case default['platform'] when %r{debian|ubuntu} pp = "include apt\napt::source { 'pc_repo': ensure => present, location => 'https://apt.puppet.com', repos => 'puppet5'}" @@ -53,9 +55,6 @@ context 'when false' do it 'ceases to manage repo config' do - pp = "class { 'puppet_agent': }" - apply_manifest(pp, catch_failures: true) - wait_for_finish_on default case default['platform'] when %r{debian|ubuntu} pp = "include apt\napt::source { 'pc_repo': ensure => absent }"