qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 42eb45: iotests: handle TypeError for Python


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 42eb45: iotests: handle TypeError for Python 3 in test 242
Date: Thu, 28 Feb 2019 04:46:04 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 42eb4591febefad29fc995785ce11a475fb47d90
      
https://github.com/qemu/qemu/commit/42eb4591febefad29fc995785ce11a475fb47d90
  Author: Andrey Shinkevich <address@hidden>
  Date:   2019-02-26 (Tue, 26 Feb 2019)

  Changed paths:
    M tests/qemu-iotests/242

  Log Message:
  -----------
  iotests: handle TypeError for Python 3 in test 242

The data type for bytes in Python 3 differs from the one in Python 2.
The type cast that is compatible with both versions was applied.

Signed-off-by: Nir Soffer <address@hidden>
Signed-off-by: Andrey Shinkevich <address@hidden>
Reported-by: Kevin Wolf <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 84f8b840a2d9ed248c80b3601d2d212cdf60cecf
      
https://github.com/qemu/qemu/commit/84f8b840a2d9ed248c80b3601d2d212cdf60cecf
  Author: Daniel P. Berrangé <address@hidden>
  Date:   2019-02-26 (Tue, 26 Feb 2019)

  Changed paths:
    M tests/qemu-iotests/233

  Log Message:
  -----------
  iotests: ensure we print nbd server log on error

If we abort the iotest early the server.log file might contain useful
information for diagnosing the problem. Ensure its contents are
displayed in this case.

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
Message-Id: <address@hidden>
[eblake: fix shell quoting]
Signed-off-by: Eric Blake <address@hidden>


  Commit: 3e6f45446b11ccc20b4b751f70331f03d70369b8
      
https://github.com/qemu/qemu/commit/3e6f45446b11ccc20b4b751f70331f03d70369b8
  Author: Daniel P. Berrangé <address@hidden>
  Date:   2019-02-26 (Tue, 26 Feb 2019)

  Changed paths:
    M tests/qemu-iotests/common.tls

  Log Message:
  -----------
  iotests: avoid broken pipe with certtool

When we run "certtool 2>&1 | head -1" the latter command is likely to
complete and exit before certtool has written everything it wants to
stderr. In at least the RHEL-7 gnutls 3.3.29 this causes certtool to
quit with broken pipe before it has finished writing the desired
output file to disk. This causes non-deterministic failures of the
iotest 233 because the certs are sometimes zero length files.
If certtool fails the "head -1" means we also lose any useful error
message it would have printed.

Thus this patch gets rid of the pipe and post-processes the output in a
more flexible & reliable manner.

Reported-by: Thomas Huth <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 093a2af7b67e98808dbb7c5364ac21602bec0881
      
https://github.com/qemu/qemu/commit/093a2af7b67e98808dbb7c5364ac21602bec0881
  Author: Peter Maydell <address@hidden>
  Date:   2019-02-28 (Thu, 28 Feb 2019)

  Changed paths:
    M tests/qemu-iotests/233
    M tests/qemu-iotests/242
    M tests/qemu-iotests/common.tls

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-02-25-v2' into 
staging

nbd patches for 2019-02-25

- iotest failure fixes for tests related to NBD

# gpg: Signature made Tue 26 Feb 2019 16:46:15 GMT
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <address@hidden>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<address@hidden>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2019-02-25-v2:
  iotests: avoid broken pipe with certtool
  iotests: ensure we print nbd server log on error
  iotests: handle TypeError for Python 3 in test 242

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/4f9ca54d1272...093a2af7b67e



reply via email to

[Prev in Thread] Current Thread [Next in Thread]