You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.3 KiB
43 lines
1.3 KiB
3 years ago
|
From 54c1c6895ec53929d44153073a862521f6ed869d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Karel Zak <kzak@redhat.com>
|
||
|
|
Date: Tue, 24 Aug 2021 10:49:32 +0200
|
||
|
|
Subject: tests: make eject umount tests more robust
|
||
|
|
|
||
|
|
Upstream: http://github.com/karelzak/util-linux/commit/abe16d0d34413555fbd621f90a0b93c2105116a2
|
||
|
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||
|
|
---
|
||
|
|
tests/ts/eject/umount | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
|
||
|
|
index 2be281ee3..04f53ed99 100755
|
||
|
|
--- a/tests/ts/eject/umount
|
||
|
|
+++ b/tests/ts/eject/umount
|
||
|
|
@@ -83,6 +83,7 @@ mkfs.ext2 -q -F $TS_DEVICE
|
||
|
|
udevadm settle
|
||
|
|
mkdir -p $TS_MOUNTPOINT
|
||
|
|
$TS_CMD_MOUNT $TS_DEVICE $TS_MOUNTPOINT
|
||
|
|
+udevadm settle
|
||
|
|
$TS_CMD_EJECT --force $TS_DEVICE && ts_log "Success"
|
||
|
|
deinit_device
|
||
|
|
ts_finalize_subtest
|
||
|
|
@@ -95,6 +96,7 @@ mkdir -p ${TS_MOUNTPOINT}1
|
||
|
|
mkdir -p ${TS_MOUNTPOINT}2
|
||
|
|
$TS_CMD_MOUNT ${TS_DEVICE}1 ${TS_MOUNTPOINT}1
|
||
|
|
$TS_CMD_MOUNT ${TS_DEVICE}2 ${TS_MOUNTPOINT}2
|
||
|
|
+udevadm settle
|
||
|
|
$TS_CMD_EJECT --force $TS_DEVICE && ts_log "Success"
|
||
|
|
deinit_device
|
||
|
|
ts_finalize_subtest
|
||
|
|
@@ -115,6 +117,7 @@ mkdir -p ${TS_MOUNTPOINT}1
|
||
|
|
mkdir -p ${TS_MOUNTPOINT}2
|
||
|
|
$TS_CMD_MOUNT ${TS_DEVICE}1 ${TS_MOUNTPOINT}1
|
||
|
|
$TS_CMD_MOUNT ${TS_DEVICE}2 ${TS_MOUNTPOINT}2
|
||
|
|
+udevadm settle
|
||
|
|
$TS_CMD_EJECT --force ${TS_DEVICE}1 && ts_log "Success"
|
||
|
|
deinit_device
|
||
|
|
ts_finalize_subtest
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|