qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 2e2be9: tests/avocado: push default timeout t

From: Richard Henderson
Subject: [Qemu-commits] [qemu/qemu] 2e2be9: tests/avocado: push default timeout to QemuBaseTest
Date: Tue, 23 Aug 2022 08:41:23 -0700 
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 2e2be93e9fc1449334a887622f44129b7cef641e
      
https://github.com/qemu/qemu/commit/2e2be93e9fc1449334a887622f44129b7cef641e
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-08-23 (Tue, 23 Aug 2022)

  Changed paths:
    M tests/avocado/avocado_qemu/__init__.py

  Log Message:
  -----------
  tests/avocado: push default timeout to QemuBaseTest

All of the QEMU tests eventually end up derrived from this class. Move
the default timeout from LinuxTest to ensure we catch them all. As 15
minutes is fairly excessive we drop the default down to 2 minutes
which is a more reasonable target for tests to aim for.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220822165608.2980552-2-alex.bennee@linaro.org>


  Commit: 2e2b6cbbc3d4b99275a6a2fbb7902dfcc1c6760a
      
https://github.com/qemu/qemu/commit/2e2b6cbbc3d4b99275a6a2fbb7902dfcc1c6760a
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-23 (Tue, 23 Aug 2022)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  tests/qtest/migration-test: Only wait for serial output where migration 
succeeds

Waiting for the serial output can take a couple of seconds - and since
we're doing a lot of migration tests, this time easily sums up to
multiple minutes. But if a test is supposed to fail, it does not make
much sense to wait for the source to be in the right state first, so
we can skip the waiting here. This way we can speed up all tests where
the migration is supposed to fail. In the gitlab-CI gprov-gcov test,
each of the migration-tests now run two minutes faster!

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220819053802.296584-2-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20220822165608.2980552-3-alex.bennee@linaro.org>


  Commit: 229aa646e870840f6fcc4a1048102f058459362a
      
https://github.com/qemu/qemu/commit/229aa646e870840f6fcc4a1048102f058459362a
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-23 (Tue, 23 Aug 2022)

  Changed paths:
    M tests/migration/aarch64/a-b-kernel.S
    M tests/migration/aarch64/a-b-kernel.h

  Log Message:
  -----------
  tests/migration/aarch64: Speed up the aarch64 migration test

The migration tests spend a lot of time waiting for a sign of live
of the guest on the serial console. The aarch64 migration code only
outputs "B"s every couple of seconds (at least it takes more than 4
seconds between each characeter on my x86 laptop). There are a lot
of migration tests, and if each test that checks for a successful
migration waits for these characters before and after migration, the
wait time sums up to multiple minutes! Let's use a shorter delay to
speed things up.

While we're at it, also remove a superfluous masking with 0xff - we're
reading and storing bytes, so the upper bits of the register do not
matter anyway.

With these changes, the test runs twice as fast on my laptop, decreasing
the total run time from approx. 8 minutes to only 4 minutes!

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220819053802.296584-3-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220822165608.2980552-4-alex.bennee@linaro.org>


  Commit: fb26f6551746a83b99b1b43a541545a4b66478a7
      
https://github.com/qemu/qemu/commit/fb26f6551746a83b99b1b43a541545a4b66478a7
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-23 (Tue, 23 Aug 2022)

  Changed paths:
    M tests/migration/i386/a-b-bootblock.S
    M tests/migration/i386/a-b-bootblock.h

  Log Message:
  -----------
  tests/migration/i386: Speed up the i386 migration test (when using TCG)

When KVM is not available, the i386 migration test also runs in a rather
slow fashion, since the guest code takes a couple of seconds to print
the "B"s on the serial console, and the migration test has to wait for
this each time. Let's increase the frequency here, too, so that the
delays in the migration tests get smaller.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220819053802.296584-4-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220822165608.2980552-5-alex.bennee@linaro.org>


  Commit: e47e0ffb5d31ad46a35bffe11799b645141c4fb2
      
https://github.com/qemu/qemu/commit/e47e0ffb5d31ad46a35bffe11799b645141c4fb2
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-08-23 (Tue, 23 Aug 2022)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  tests/qtest/migration-test: Remove duplicated test_postcopy from the test plan

test_postcopy() is currently run twice - which is just a waste of resources
and time. The commit d1a27b169b2d that introduced the duplicate talked about
renaming the "postcopy/unix" test, but apparently it forgot to remove the
old entry. Let's do that now.

Fixes: d1a27b169b ("tests: Add postcopy tls migration test")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220819053802.296584-5-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20220822165608.2980552-6-alex.bennee@linaro.org>


  Commit: 876ed1c1d373a9eb41352165aae3806215e30b1a
      
https://github.com/qemu/qemu/commit/876ed1c1d373a9eb41352165aae3806215e30b1a
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-08-23 (Tue, 23 Aug 2022)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: try and clarify preferred block semantics

Try to correct any confusion about QEMU's Byzantine disk options by
laying out the preferred "modern" options as-per:

 "<danpb> (best:  -device + -blockdev,  2nd obsolete syntax: -device +
     -drive,  3rd obsolete syntax: -drive, 4th obsolete syntax: -hdNN)"

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Cc: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Hanna Reitz <hreitz@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Message-Id: <20220822165608.2980552-7-alex.bennee@linaro.org>


  Commit: d5c0ef58e2722b4e3eb2b3947d69a7a9c8b44d08
      
https://github.com/qemu/qemu/commit/d5c0ef58e2722b4e3eb2b3947d69a7a9c8b44d08
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2022-08-23 (Tue, 23 Aug 2022)

  Changed paths:
    M qemu-options.hx
    M tests/avocado/avocado_qemu/__init__.py
    M tests/migration/aarch64/a-b-kernel.S
    M tests/migration/aarch64/a-b-kernel.h
    M tests/migration/i386/a-b-bootblock.S
    M tests/migration/i386/a-b-bootblock.h
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  Merge tag 'pull-for-7.1-fixes-230822-1' of https://github.com/stsquad/qemu 
into staging

Testing and doc updates:

  - default timeout for all QemuBaseTests is 120s
  - optimise migration tests to run faster
  - removed duplicate migration test
  - add some clarifying language to block options in manual

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmME8Q0ACgkQ+9DbCVqe
# KkQgfAf/eGjKO7tfxQqsyH63ckmxJPRkZ4XAmgUfA39G1a+RlDg/yQg//gBiLjWJ
# pH4hED2CWQklXw24AYe5JCjoOA5e3kG8eqVktns9mbkc+uSjfTqKTXl6v+y/ODxw
# LvaexedbuNWko1TL2Zm6g+YWIoAxj22clbTbLyBdwjnJBENS+47sA4h0ZVq76ThK
# kIeJOOvPE253lddtGiJWJPtCYfsWcyst03hgG0nUW8+uvbrtN1p1kdUX0EJOYjZf
# 6WoV2WJnFXB9jCp1I/PkoTGlZ+RxpxuRKKMkllpMe8rNwUk/qng1MX6fcu1a209M
# R8zK56YJ2HPM8pi4PI1RXB4vd201hQ==
# =21nJ
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 23 Aug 2022 08:23:57 AM PDT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) 
<alex.bennee@linaro.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* tag 'pull-for-7.1-fixes-230822-1' of https://github.com/stsquad/qemu:
  qemu-options: try and clarify preferred block semantics
  tests/qtest/migration-test: Remove duplicated test_postcopy from the test plan
  tests/migration/i386: Speed up the i386 migration test (when using TCG)
  tests/migration/aarch64: Speed up the aarch64 migration test
  tests/qtest/migration-test: Only wait for serial output where migration 
succeeds
  tests/avocado: push default timeout to QemuBaseTest

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/ba58ccbef603...d5c0ef58e272
reply via email to
[Prev in Thread] Current Thread [Next in Thread]