Skip to content

Request report storage explicitly in cached-catalog drift test #598

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

Open
silug wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Request report storage explicitly in cached-catalog drift test #598

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
18 changes: 13 additions & 5 deletions acceptance/tests/direct_puppet/cached_catalog_remediate_local_drift.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,17 @@

basedir = master.tmpdir(File.basename(__FILE__, '.*'))
module_dir = "#{basedir}/environments/production/modules"
master_reportdir = create_tmpdir_for_user(master, 'reportdir')

master_opts = {
'main' => {
'environmentpath' => "#{basedir}/environments"
},
# The server no longer stores reports by default (reports = none);
# request storage explicitly like the other report-checking tests do.
'master' => {
'reportdir' => master_reportdir,
'reports' => 'store'
}
}

Expand All @@ -28,6 +35,7 @@
teardown do
cleanup_puppetserver_code_id_scripts(master, basedir)
on master, "rm -rf #{basedir}"
on master, "rm -rf #{master_reportdir}"

agents.each do |agent|
on(agent, puppet('config print lastrunfile')) do |command_result|
Expand Down Expand Up @@ -96,9 +104,9 @@
# sends a report.

step "Remove existing reports from server reports directory"
on(master, "rm -rf /opt/puppetlabs/server/data/puppetserver/reports/#{agent.node_name}/*")
r = on(master, "ls /opt/puppetlabs/server/data/puppetserver/reports/#{agent.node_name} | wc -l").stdout.chomp
assert_equal(r, '0', "reports directory should be empty!")
on(master, "rm -rf #{master_reportdir}/#{agent.node_name}/*")
r = on(master, "ls #{master_reportdir}/#{agent.node_name} 2>/dev/null | wc -l").stdout.chomp
assert_equal('0', r, "reports directory should be empty!")

step "Verify puppet run without drift does not make file request from server"
r = on(agent, puppet("agent",
Expand All @@ -113,8 +121,8 @@
assert_equal(r, "", "Fail: Did agent try to contact server?")

step "Verify report was delivered to server"
r = on(master, "ls /opt/puppetlabs/server/data/puppetserver/reports/#{agent.node_name} | wc -l").stdout.chomp
assert_equal(r, '1', "Reports directory should have one file")
r = on(master, "ls #{master_reportdir}/#{agent.node_name} | wc -l").stdout.chomp
assert_equal('1', r, "Reports directory should have one file")

step "agent: #{agent}: Remove the test file to simulate drift"
on(agent, "rm -rf #{agent_test_file_path}")
Expand Down