From: Kevin Wolf <kwolf@redhat.com>
To: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Cc: qemu-block@nongnu.org, jsnow@redhat.com, qemu-devel@nongnu.org,
mreitz@redhat.com, den@openvz.org
Subject: Re: [PATCH] iotests: drop group file
Date: Tue, 24 Mar 2020 10:36:29 +0100 [thread overview]
Message-ID: <20200324093629.GC5417@linux.fritz.box> (raw)
In-Reply-To: <20200324074156.5330-1-vsementsov@virtuozzo.com>
Am 24.03.2020 um 08:41 hat Vladimir Sementsov-Ogievskiy geschrieben:
> When sending iotests to upstream or do patch porting from one branch
> to another we very often have to resolve conflicts in group file, as
> many absolutely independent features are intersecting by this file.
> These conflicts are simple, but imagine how much time we all have
> already spent on resolving them? Let's finally get rid of group file.
>
> This patch transposes group info: instead of collecting it in one file,
> let each test define its groups by itself.
>
> Several steps are done to achive it:
>
> 1. Define groups in test files automatically:
>
> grep '^[0-9]\{3\} ' group | while read line; do
> file=$(awk '{print $1}' <<< "$line");
> groups=$(sed -e 's/^... //' <<< "$line");
> awk "NR==2{print \"# group: $groups\"}1" $file > tmp;
> cat tmp > $file;
> done
>
> 2. Copy groups documentation into docs/devel/testing.rst, which already
> has a section about iotests.
>
> 3. Modify check script to work without group file.
>
> Here is a logic change: before, even if test do not belong to any
> group (only iotest 142 currently) it should be defined in group
> file. Now, test is not forced to define any group. Instead check
> considers all files with names matching [0-9][0-9][0-9] as tests.
This has both a positive and a negative effect: Now you don't have to
modify another file when you add a new test, but it will be picked up
automatically. However, if you want to disable a test, you could
previously just remove it from groups (or comment it out), and now you
have to delete the test instead.
Downstream, I think we still disable a few tests because we're compiling
out features that are required for some tests to pass, and deleting the
test cases completely would probably move conflicts just to a different
place.
So I think we need a method to distuingish an enabled test that is in no
group from a disabled test.
> check script is also refactored to make it simple to do next cool
> thing about iotests: allow meaningful names for test-case files.
This one would also require us to be able to distinguish test case files
from arbitrary other files.
> -#
> -# test-group association ... one line per test
> -#
> -001 rw auto quick
> -002 rw auto quick
> -003 rw auto
> -004 rw auto quick
> -005 img auto quick
> -# 006 was removed, do not reuse
We lose these comments without a replacement. I wonder whether it's
important or if we can think of another way to make sure that numbers
aren't reused. (I'm not completely sure any more why we decided that we
don't want to reuse numbers. Maybe because of backports?)
Kevin
next prev parent reply other threads:[~2020-03-24 9:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 7:41 [PATCH] iotests: drop group file Vladimir Sementsov-Ogievskiy
2020-03-24 7:57 ` no-reply
2020-03-24 8:04 ` Vladimir Sementsov-Ogievskiy
2020-03-24 9:36 ` Kevin Wolf [this message]
2020-03-24 9:51 ` Daniel P. Berrangé
2020-03-24 10:06 ` Vladimir Sementsov-Ogievskiy
2020-03-24 10:02 ` Vladimir Sementsov-Ogievskiy
2020-03-24 10:21 ` Daniel P. Berrangé
2020-03-24 10:35 ` Kevin Wolf
2020-03-24 10:08 ` Denis V. Lunev
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=20200324093629.GC5417@linux.fritz.box \
--to=kwolf@redhat.com \
--cc=den@openvz.org \
--cc=jsnow@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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;
as well as URLs for NNTP newsgroup(s).