From: Nikolay Borisov <nborisov@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH] btrfs/163: Fix recently broken test
Date: Thu, 24 Sep 2020 15:19:10 +0300 [thread overview]
Message-ID: <20200924121910.22477-1-nborisov@suse.com> (raw)
Upstream commit "btrfs: fix replace of seed device" broke btrfs/163 as
it disallowed replacing the seed device. Update the test to account for
this change in behavior.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
That commit still hasn't landed into upstream master but it's in misc-next hence
I discovered the failures. I guess this is really a heads up and will have to be
resubmitted when the commit is sent for upstream inclusion.
tests/btrfs/163 | 13 +++++--------
tests/btrfs/163.out | 4 ----
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/tests/btrfs/163 b/tests/btrfs/163
index 24c725afb6b9..7140c1874165 100755
--- a/tests/btrfs/163
+++ b/tests/btrfs/163
@@ -4,7 +4,7 @@
#
# FS QA Test 163
#
-# Test case to verify that a seed device can be replaced
+# Test case to verify that a seed device cannot be replaced
# Create a seed device
# Create a sprout device
# Remount RW
@@ -68,14 +68,11 @@ add_sprout()
replace_seed()
{
- _run_btrfs_util_prog replace start -fB $dev_seed $dev_replace_tgt $SCRATCH_MNT
- _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT
- _scratch_unmount
- run_check _mount $dev_replace_tgt $SCRATCH_MNT
- echo -- sprout --
- od -x $SCRATCH_MNT/foobar
+ $BTRFS_UTIL_PROG replace start -fB $dev_seed $dev_replace_tgt $SCRATCH_MNT &> /dev/null
+ if [ $? -ne 1 ]; then
+ _fail "replace should have failed"
+ fi
_scratch_unmount
-
}
seed_is_mountable()
diff --git a/tests/btrfs/163.out b/tests/btrfs/163.out
index 91f6f5b6f48a..7890612fc630 100644
--- a/tests/btrfs/163.out
+++ b/tests/btrfs/163.out
@@ -3,7 +3,3 @@ QA output created by 163
0000000 abab abab abab abab abab abab abab abab
*
20000000
--- sprout --
-0000000 abab abab abab abab abab abab abab abab
-*
-20000000
--
2.17.1
next reply other threads:[~2020-09-24 12:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 12:19 Nikolay Borisov [this message]
2020-09-24 12:35 ` [PATCH] btrfs/163: Fix recently broken test Anand Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200924121910.22477-1-nborisov@suse.com \
--to=nborisov@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox