Skip to content

Commit

Permalink
Revert "test: Make restore_dir() work for OSTree images"
Browse files Browse the repository at this point in the history
This reverts commit 413111f.

We don't need this anymore since overrides are in /etc.

Letting restore_dir work on OSTree images might cause the destructive
tests TestServices.testBasic and TestServices.testLogs and maybe
others to be flaky.
  • Loading branch information
mvollmer authored and martinpitt committed Dec 19, 2024
1 parent 11728bd commit 7b9fc65
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/common/testlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -2360,7 +2360,7 @@ def restore_dir(
If the directory needs to survive reboot, `reboot_safe=True` needs to be specified; then this
will just backup/restore the directory instead of bind-mounting, which is less robust.
"""
if not self.is_nondestructive() and not self.machine.ostree_image:
if not self.is_nondestructive():
return # skip for efficiency reasons

exe = self.machine.execute
Expand Down

0 comments on commit 7b9fc65

Please sign in to comment.