2022-01-25 12:09:16 +00:00
|
|
|
From 9e9dc7d3ae9a5fdd59ccecf73b2066fe2cdaa3c3 Mon Sep 17 00:00:00 2001
|
2021-08-24 09:28:31 +00:00
|
|
|
From: Karel Zak <kzak@redhat.com>
|
|
|
|
Date: Tue, 24 Aug 2021 10:49:32 +0200
|
2022-01-25 12:09:16 +00:00
|
|
|
Subject: tests: make eject umount tests more robust
|
2021-08-24 09:28:31 +00:00
|
|
|
|
2022-01-25 12:09:16 +00:00
|
|
|
Upstream: http://github.com/karelzak/util-linux/commit/abe16d0d34413555fbd621f90a0b93c2105116a2
|
2021-08-24 09:28:31 +00:00
|
|
|
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
|
2022-01-25 12:09:16 +00:00
|
|
|
index 2be281ee3..04f53ed99 100755
|
2021-08-24 09:28:31 +00:00
|
|
|
--- a/tests/ts/eject/umount
|
|
|
|
+++ b/tests/ts/eject/umount
|
2022-01-25 12:09:16 +00:00
|
|
|
@@ -83,6 +83,7 @@ mkfs.ext2 -q -F $TS_DEVICE
|
2021-08-24 09:28:31 +00:00
|
|
|
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
|
2022-01-25 12:09:16 +00:00
|
|
|
@@ -95,6 +96,7 @@ mkdir -p ${TS_MOUNTPOINT}1
|
2021-08-24 09:28:31 +00:00
|
|
|
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
|
2022-01-25 12:09:16 +00:00
|
|
|
@@ -115,6 +117,7 @@ mkdir -p ${TS_MOUNTPOINT}1
|
2021-08-24 09:28:31 +00:00
|
|
|
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
|
|
|
|
--
|
2022-01-25 12:09:16 +00:00
|
|
|
2.34.1
|
2021-08-24 09:28:31 +00:00
|
|
|
|