Skip to content

Commit 2d40f1a

Browse files
committed
Merge PR ceph#62062 into main
* refs/pull/62062/head: qa/cephfs: avoid unnecessary importing in test_volumes.py Reviewed-by: Patrick Donnelly <[email protected]>
2 parents 83a82c5 + b7d47bc commit 2d40f1a

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

qa/tasks/cephfs/test_volumes.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from tasks.cephfs.fuse_mount import FuseMount
1616
from teuthology.contextutil import safe_while
1717
from teuthology.exceptions import CommandFailedError
18-
from teuthology import contextutil
1918

2019
log = logging.getLogger(__name__)
2120

@@ -9218,7 +9217,7 @@ def test_dangling_symlink(self):
92189217
clone_path = f'./volumes/_nogroup/{clone}'
92199218
self.mount_a.run_shell(['sudo', 'rm', '-rf', clone_path], omit_sudo=False)
92209219

9221-
with contextutil.safe_while(sleep=5, tries=6) as proceed:
9220+
with safe_while(sleep=5, tries=6) as proceed:
92229221
while proceed():
92239222
try:
92249223
result = json.loads(self._fs_cmd("subvolume", "snapshot", "info", self.volname, subvolume, snapshot))

0 commit comments

Comments
 (0)