[v2,00/23] iotests: Add and use $SOCK_DIR
mbox series

Message ID 20191017133155.5327-1-mreitz@redhat.com
Headers show
Series
  • iotests: Add and use $SOCK_DIR
Related show

Message

Max Reitz Oct. 17, 2019, 1:31 p.m. UTC
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(-)

Comments

Eric Blake Oct. 17, 2019, 2:59 p.m. UTC | #1
On 10/17/19 8:31 AM, Max Reitz wrote:
> 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

I just thought of another potential concern there - what do you think of 
my response there?  Depending on how that thread goes, it may work to 
just amend the commit or take it as-is without having to go to a full v3 
posting...

> - 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)

Yes, looks like you handled that well.  My R-b is okay there.
Max Reitz Oct. 18, 2019, 4:02 p.m. UTC | #2
On 17.10.19 15:31, Max Reitz wrote:
> 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)

Thanks for the rewies, applied to my block branch:

https://git.xanclic.moe/XanClic/qemu/commits/branch/block

Max