Python queue, 2018-10-03
* Remove fixed serial device errors from device-crash-test * Remove unnecessary Python 2.6 compatibility code -----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJbtXg+AAoJECgHk2+YTcWm65wP/3LfgSzM1znaWa3RgNNN3rKB FA+C6lT6LM+0TOf/uwoM2Q0vfgo3oEE1WbrBCHjI0LnsV0D94KOOkd6oPuFGdhJg HqPDAhJHa/FDx+et4QV81uKVKhyl/9xQ3j5elgydaGRMeWDZmhYM6nGL7M3+LWwh ymNDKbfMnfESvPvIYW/VS8LDtU1V88yf+dGtK3lyyMgDIp2OiaesGwYAoa695Djg jbZq3meU7vRNo6C92FC1KP363x2KLzpuiEmpIvPMK37ScpS8O4QGzNmQGP2Z9UM1 Ow+/QJIpNrkqU6B3SObxPL7BhdQZw/GLiSSt0/svaXDKqvcU87uyM14hl1SB9mbU SMQXKumTOwO/UQpfl/MNPQPHxBDSoMNSI7Rbzf7QjhnqYp6+1o5PffMbzPa/4ThJ SMdIfBJqe4Bc/pl0j2O0Cao3nhpvmBBuq5cJk+4z7zKAr2jenXr4EY0Uwl8MYTY+ S5vzgjKjVtSQP0XhSFtsf+5M3ztfUhXsyX95Xi4qh1waAHsJTzMHIu2urPOnvDzO RodfHcO5Vcnw7C9iSquqNZkiL9cbkMLpIojwtp9PGeiUIOyZSm9fVEzt0ZVIyDIW jxChIAgn3lHSovVaWdL9tnmYZyOnLyKThPfQo1inFcFR2AAhvgqR9yGeKGIZ2KEr pYm3E0dnJzR8o0lC7YCX =h6yh -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging Python queue, 2018-10-03 * Remove fixed serial device errors from device-crash-test * Remove unnecessary Python 2.6 compatibility code # gpg: Signature made Thu 04 Oct 2018 03:17:34 BST # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/python-next-pull-request: scripts/device-crash-test: Remove entries for serial devices Revert "tests: migration/guestperf Python 2.6 argparse compatibility" Revert "docker.py: Python 2.6 argparse compatibility" device-crash-test: No need for sys.path hack Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
638ad4ad17
@ -35,7 +35,6 @@ import random
|
||||
import argparse
|
||||
from itertools import chain
|
||||
|
||||
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'scripts'))
|
||||
from qemu import QEMUMachine
|
||||
|
||||
logger = logging.getLogger('device-crash-test')
|
||||
@ -99,7 +98,6 @@ ERROR_WHITELIST = [
|
||||
{'device':'isa-ipmi-bt', 'expected':True}, # IPMI device requires a bmc attribute to be set
|
||||
{'device':'isa-ipmi-kcs', 'expected':True}, # IPMI device requires a bmc attribute to be set
|
||||
{'device':'isa-parallel', 'expected':True}, # Can't create serial device, empty char device
|
||||
{'device':'isa-serial', 'expected':True}, # Can't create serial device, empty char device
|
||||
{'device':'ivshmem', 'expected':True}, # You must specify either 'shm' or 'chardev'
|
||||
{'device':'ivshmem-doorbell', 'expected':True}, # You must specify a 'chardev'
|
||||
{'device':'ivshmem-plain', 'expected':True}, # You must specify a 'memdev'
|
||||
@ -110,9 +108,6 @@ ERROR_WHITELIST = [
|
||||
{'device':'pc-dimm', 'expected':True}, # 'memdev' property is not set
|
||||
{'device':'pci-bridge', 'expected':True}, # Bridge chassis not specified. Each bridge is required to be assigned a unique chassis id > 0.
|
||||
{'device':'pci-bridge-seat', 'expected':True}, # Bridge chassis not specified. Each bridge is required to be assigned a unique chassis id > 0.
|
||||
{'device':'pci-serial', 'expected':True}, # Can't create serial device, empty char device
|
||||
{'device':'pci-serial-2x', 'expected':True}, # Can't create serial device, empty char device
|
||||
{'device':'pci-serial-4x', 'expected':True}, # Can't create serial device, empty char device
|
||||
{'device':'pxa2xx-dma', 'expected':True}, # channels value invalid
|
||||
{'device':'pxb', 'expected':True}, # Bridge chassis not specified. Each bridge is required to be assigned a unique chassis id > 0.
|
||||
{'device':'scsi-block', 'expected':True}, # drive property not set
|
||||
@ -218,7 +213,6 @@ ERROR_WHITELIST = [
|
||||
{'exitcode':-6, 'log':r"Object .* is not an instance of type generic-pc-machine", 'loglevel':logging.ERROR},
|
||||
{'exitcode':-6, 'log':r"Object .* is not an instance of type e500-ccsr", 'loglevel':logging.ERROR},
|
||||
{'exitcode':-6, 'log':r"vmstate_register_with_alias_id: Assertion `!se->compat \|\| se->instance_id == 0' failed", 'loglevel':logging.ERROR},
|
||||
{'exitcode':-11, 'device':'isa-serial', 'loglevel':logging.ERROR, 'expected':True},
|
||||
|
||||
# everything else (including SIGABRT and SIGSEGV) will be a fatal error:
|
||||
{'exitcode':None, 'fatal':True, 'loglevel':logging.FATAL},
|
||||
|
@ -14,14 +14,12 @@
|
||||
from __future__ import print_function
|
||||
import os
|
||||
import sys
|
||||
sys.path.append(os.path.join(os.path.dirname(__file__),
|
||||
'..', '..', 'scripts'))
|
||||
import argparse
|
||||
import subprocess
|
||||
import json
|
||||
import hashlib
|
||||
import atexit
|
||||
import uuid
|
||||
import argparse
|
||||
import tempfile
|
||||
import re
|
||||
import signal
|
||||
|
@ -19,14 +19,12 @@ from __future__ import print_function
|
||||
#
|
||||
|
||||
|
||||
import os
|
||||
import os.path
|
||||
import sys
|
||||
sys.path.append(os.path.join(os.path.dirname(__file__),
|
||||
'..', '..', '..', 'scripts'))
|
||||
import argparse
|
||||
import fnmatch
|
||||
import os
|
||||
import os.path
|
||||
import platform
|
||||
import sys
|
||||
import logging
|
||||
|
||||
from guestperf.hardware import Hardware
|
||||
|
Loading…
Reference in New Issue
Block a user