[0/2] iotests/207: Filter host fingerprint

Message

Hanna Czenczek March 18, 2022, 12:53 p.m. UTC

Hi,

Commit e3296cc796aeaf (“block: print the server key type and fingerprint
on failure”) improved the verbosity of our ssh block driver's error
messages for fingerprint mismatches.  However, iotest 207, which tests
such errors, has not been adjusted accordingly.

Since the fingerprint will differ between hosts, we need to filter it
(and can’t just statically adjust the reference output).  The problem is
that the error condition is printed by iotest.py’s VM.run_job(), so we
need to pass the filter to that function.  Right now, VM.run_job()
doesn’t support any filters, though, so patch 1 adds a filter parameter
and makes VM.run_job() use it.

Patch 2 then has the fix for iotest 207.


Hanna Reitz (2):
  iotests.py: Filters for VM.run_job()
  iotests/207: Filter host fingerprint

 tests/qemu-iotests/207        |  7 ++++++-
 tests/qemu-iotests/207.out    |  6 +++---
 tests/qemu-iotests/iotests.py | 26 ++++++++++++++++----------
 3 files changed, 25 insertions(+), 14 deletions(-)

Comments

Hanna Czenczek March 22, 2022, 9:50 a.m. UTC | #1

On 18.03.22 13:53, Hanna Reitz wrote:
> Hi,
>
> Commit e3296cc796aeaf (“block: print the server key type and fingerprint
> on failure”) improved the verbosity of our ssh block driver's error
> messages for fingerprint mismatches.  However, iotest 207, which tests
> such errors, has not been adjusted accordingly.
>
> Since the fingerprint will differ between hosts, we need to filter it
> (and can’t just statically adjust the reference output).  The problem is
> that the error condition is printed by iotest.py’s VM.run_job(), so we
> need to pass the filter to that function.  Right now, VM.run_job()
> doesn’t support any filters, though, so patch 1 adds a filter parameter
> and makes VM.run_job() use it.
>
> Patch 2 then has the fix for iotest 207.

Thanks for the review, applied to my block branch.

Hanna