Commit 638ad4ad authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b8e5671a cd0c3da7

scripts/device-crash-test

+0 −6
Original line number Diff line number Diff line
@@ -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},

tests/docker/docker.py

+1 −3
Original line number Diff line number Diff line
@@ -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

tests/migration/guestperf/shell.py

+3 −5
Original line number Diff line number Diff line
@@ -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