Skip to content

iotests: Add and use $SOCK_DIR

Max Reitz qemu-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest23 patches 14 repliesIn review
  2. v123 patches 42 repliesSuperseded

Changes in v2 from the cover letter

- Patch 1: Use mkdir -p
- Patches 4/23: Only add the $SOCK_DIR replacement line in patch 4 and only drop the $TEST_DIR line in patch 23 (Took Eric’s R-b on both because that’s how I interpreted his comments)

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/23iotests: Introduce $SOCK_DIRtests/qemu-iotests/check+13 -23 replies
2/23iotests.py: Store socket files in $SOCK_DIRpython/qemu/machine.py python/qemu/qtest.py tests/qemu-iotests/iotests.py+21 -70 replies
3/23iotests.py: Add @base_dir to FilePaths etc.tests/qemu-iotests/iotests.py+6 -60 replies
4/23iotests: Filter $SOCK_DIRtests/qemu-iotests/common.filter+5 -11 reply
5/23iotests: Let common.nbd create socket in $SOCK_DIRtests/qemu-iotests/241 tests/qemu-iotests/common.nbd+1 -31 reply
6/23iotests/083: Create socket in $SOCK_DIRtests/qemu-iotests/083 tests/qemu-iotests/083.out+20 -200 replies
7/23iotests/140: Create socket in $SOCK_DIRtests/qemu-iotests/140 tests/qemu-iotests/140.out+5 -50 replies
8/23iotests/143: Create socket in $SOCK_DIRtests/qemu-iotests/143 tests/qemu-iotests/143.out+4 -40 replies
9/23iotests/147: Create socket in $SOCK_DIRtests/qemu-iotests/147+1 -10 replies
10/23iotests/181: Create socket in $SOCK_DIRtests/qemu-iotests/181+1 -10 replies
11/23iotests/182: Create socket in $SOCK_DIRtests/qemu-iotests/182+2 -20 replies
12/23iotests/183: Create socket in $SOCK_DIRtests/qemu-iotests/183+1 -10 replies
13/23iotests/192: Create socket in $SOCK_DIRtests/qemu-iotests/192 tests/qemu-iotests/192.out+3 -31 reply
14/23iotests/194: Create sockets in $SOCK_DIRtests/qemu-iotests/194+2 -20 replies
15/23iotests/201: Create socket in $SOCK_DIRtests/qemu-iotests/201+1 -11 reply
16/23iotests/205: Create socket in $SOCK_DIRtests/qemu-iotests/205+1 -11 reply
17/23iotests/208: Create socket in $SOCK_DIRtests/qemu-iotests/208+1 -10 replies
18/23iotests/209: Create socket in $SOCK_DIRtests/qemu-iotests/209+2 -10 replies
19/23iotests/222: Create socket in $SOCK_DIRtests/qemu-iotests/222+1 -10 replies
20/23iotests/223: Create socket in $SOCK_DIRtests/qemu-iotests/223+7 -71 reply
21/23iotests/240: Create socket in $SOCK_DIRtests/qemu-iotests/240+2 -21 reply
22/23iotests/267: Create socket in $SOCK_DIRtests/qemu-iotests/267 tests/qemu-iotests/267.out+3 -31 reply
23/23iotests: Drop TEST_DIR filter from _filter_nbdtests/qemu-iotests/common.filter+0 -11 reply

Reviews trailers per patch

All 23 patches have a Reviewed-by or Acked-by.

PatchEric BlakeThomas Huth
1/23R-b
2/23R-b R-b
3/23R-b
4/23R-b R-b
5/23R-b R-b
6/23R-b R-b
7/23R-b R-b
8/23R-b R-b
9/23R-b R-b
10/23R-b R-b
11/23R-b R-b
12/23R-b R-b
13/23R-b R-b
14/23R-b
15/23R-b R-b
16/23R-b R-b
17/23R-b
18/23R-b
19/23R-b
20/23R-b R-b
21/23R-b R-b
22/23R-b R-b
23/23R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/23] iotests: Add and use $SOCK_DIR

Hi,

Perhaps the main reason we cannot run important tests such as 041 in CI is that when they care Unix sockets in $TEST_DIR, the path may become too long to connect to them.

To get by this problem, this series lets the check script create a new temporary directory (mktemp -d) and then makes the iotests use it for all Unix sockets.

v2:
- Patch 1: Use mkdir -p
- Patches 4/23: Only add the $SOCK_DIR replacement line in patch 4 and only drop the $TEST_DIR line in patch 23 (Took Eric’s R-b on both because that’s how I interpreted his comments)

git-backport-diff against v2:

Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/23:[0010] [FC] 'iotests: Introduce $SOCK_DIR' 002/23:[----] [--] 'iotests.py: Store socket files in $SOCK_DIR' 003/23:[----] [--] 'iotests.py: Add @base_dir to FilePaths etc.' 004/23:[0002] [FC] 'iotests: Filter $SOCK_DIR'
005/23:[----] [--] 'iotests: Let common.nbd create socket in $SOCK_DIR' 006/23:[----] [--] 'iotests/083: Create socket in $SOCK_DIR' 007/23:[----] [--] 'iotests/140: Create socket in $SOCK_DIR' 008/23:[----] [--] 'iotests/143: Create socket in $SOCK_DIR' 009/23:[----] [--] 'iotests/147: Create socket in $SOCK_DIR' 010/23:[----] [--] 'iotests/181: Create socket in $SOCK_DIR' 011/23:[----] [--] 'iotests/182: Create socket in $SOCK_DIR' 012/23:[----] [--] 'iotests/183: Create socket in $SOCK_DIR' 013/23:[----] [--] 'iotests/192: Create socket in $SOCK_DIR' 014/23:[----] [--] 'iotests/194: Create sockets in $SOCK_DIR' 015/23:[----] [--] 'iotests/201: Create socket in $SOCK_DIR' 016/23:[----] [--] 'iotests/205: Create socket in $SOCK_DIR' 017/23:[----] [--] 'iotests/208: Create socket in $SOCK_DIR' 018/23:[----] [--] 'iotests/209: Create socket in $SOCK_DIR' 019/23:[----] [--] 'iotests/222: Create socket in $SOCK_DIR' 020/23:[----] [--] 'iotests/223: Create socket in $SOCK_DIR' 021/23:[----] [--] 'iotests/240: Create socket in $SOCK_DIR' 022/23:[----] [--] 'iotests/267: Create socket in $SOCK_DIR' 023/23:[0002] [FC] 'iotests: Drop TEST_DIR filter from _filter_nbd'

Max Reitz (23):
iotests: Introduce $SOCK_DIR
iotests.py: Store socket files in $SOCK_DIR iotests.py: Add @base_dir to FilePaths etc.
iotests: Filter $SOCK_DIR
iotests: Let common.nbd create socket in $SOCK_DIR iotests/083: Create socket in $SOCK_DIR iotests/140: Create socket in $SOCK_DIR iotests/143: Create socket in $SOCK_DIR iotests/147: Create socket in $SOCK_DIR iotests/181: Create socket in $SOCK_DIR iotests/182: Create socket in $SOCK_DIR iotests/183: Create socket in $SOCK_DIR iotests/192: Create socket in $SOCK_DIR iotests/194: Create sockets in $SOCK_DIR iotests/201: Create socket in $SOCK_DIR iotests/205: Create socket in $SOCK_DIR iotests/208: Create socket in $SOCK_DIR iotests/209: Create socket in $SOCK_DIR iotests/222: Create socket in $SOCK_DIR iotests/223: Create socket in $SOCK_DIR iotests/240: Create socket in $SOCK_DIR iotests/267: Create socket in $SOCK_DIR
iotests: Drop TEST_DIR filter from _filter_nbd

 python/qemu/machine.py           | 15 +++++++++++---
 python/qemu/qtest.py             |  9 ++++++---
 tests/qemu-iotests/083           |  6 +++---
 tests/qemu-iotests/083.out       | 34 ++++++++++++++++----------------
 tests/qemu-iotests/140           |  8 ++++----
 tests/qemu-iotests/140.out       |  2 +-
 tests/qemu-iotests/143           |  6 +++---
 tests/qemu-iotests/143.out       |  2 +-
 tests/qemu-iotests/147           |  2 +-
 tests/qemu-iotests/181           |  2 +-
 tests/qemu-iotests/182           |  4 ++--
 tests/qemu-iotests/183           |  2 +-
 tests/qemu-iotests/192           |  4 ++--
 tests/qemu-iotests/192.out       |  2 +-
 tests/qemu-iotests/194           |  4 ++--
 tests/qemu-iotests/201           |  2 +-
 tests/qemu-iotests/205           |  2 +-
 tests/qemu-iotests/208           |  2 +-
 tests/qemu-iotests/209           |  3 ++-
 tests/qemu-iotests/222           |  2 +-
 tests/qemu-iotests/223           | 14 ++++++-------
 tests/qemu-iotests/240           |  4 ++--
 tests/qemu-iotests/241           |  2 --
 tests/qemu-iotests/267           |  4 ++--
 tests/qemu-iotests/267.out       |  2 +-
 tests/qemu-iotests/check         | 15 ++++++++++++--
 tests/qemu-iotests/common.filter |  7 +++++--
 tests/qemu-iotests/common.nbd    |  2 +-
 tests/qemu-iotests/iotests.py    | 16 ++++++++-------
 29 files changed, 103 insertions(+), 76 deletions(-)
Signature · 1 line
2.21.0