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

test: simplify restoring /var/lib/sudo/lectured #19604

Merged
merged 1 commit into from
Nov 14, 2023

Conversation

jelly
Copy link
Member

@jelly jelly commented Nov 13, 2023

Use restore_dir instead of restoring four different files.

Use restore_dir instead of restoring four different files.
Copy link
Member

@martinpitt martinpitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! The flakes look familiar, retrying.

self.restore_file("/var/db/sudo/lectured/admin")
self.restore_file("/var/lib/sudo/lectured/admin")
m.execute("rm -rf /var/{db,lib}/sudo/lectured/admin")
self.restore_dir("/var/db/sudo/lectured")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The old code also had /var/lib/sudo/lectured , but looking at tests that doesn't seem to be necessary any more.

@martinpitt martinpitt marked this pull request as ready for review November 14, 2023 05:23
@martinpitt
Copy link
Member

I accept the TestSuperuserDashboard.test flakes here. They are our top flakes on https://ci-weather-cockpit.apps.ocp.cloud.ci.centos.org/tests.html?days=3 and need urgent attention, but don't have to block PRs. With 3x affected retries they are too hard to get green.

@martinpitt martinpitt merged commit 626e4f9 into cockpit-project:main Nov 14, 2023
89 of 91 checks passed
@jelly jelly deleted the simplify-lecture-cleanup branch November 14, 2023 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants