Skip to content

Commit 7396702

Browse files
committed
Merge PR ceph#60219 into main
* refs/pull/60219/head: qa/cephfs: update earmark values to valid ones in test_volumes.py Reviewed-by: John Mulligan <[email protected]> Reviewed-by: Venky Shankar <[email protected]>
2 parents 0f71333 + 78ae3b1 commit 7396702

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

qa/tasks/cephfs/test_volumes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2388,7 +2388,7 @@ def test_subvolume_set_and_get_earmark(self):
23882388
self._fs_cmd("subvolume", "create", self.volname, subvolume)
23892389

23902390
# set earmark
2391-
earmark = "smb.test"
2391+
earmark = "smb"
23922392
self._fs_cmd("subvolume", "earmark", "set", self.volname, subvolume, "--earmark", earmark)
23932393

23942394
# get earmark
@@ -2401,7 +2401,7 @@ def test_subvolume_clear_earmark(self):
24012401
self._fs_cmd("subvolume", "create", self.volname, subvolume)
24022402

24032403
# set earmark
2404-
earmark = "smb.test"
2404+
earmark = "smb"
24052405
self._fs_cmd("subvolume", "earmark", "set", self.volname, subvolume, "--earmark", earmark)
24062406

24072407
# remove earmark
@@ -2559,7 +2559,7 @@ def test_subvolume_info(self):
25592559
self.assertIn(feature, subvol_info["features"], msg="expected feature '{0}' in subvolume".format(feature))
25602560

25612561
# set earmark
2562-
earmark = "smb.test"
2562+
earmark = "smb"
25632563
self._fs_cmd("subvolume", "earmark", "set", self.volname, subvolume, "--earmark", earmark)
25642564

25652565
subvol_info = json.loads(self._get_subvolume_info(self.volname, subvolume))

0 commit comments

Comments
 (0)