On 3/31/20 2:00 AM, John Snow wrote:
> I had to fix a merge conflict, so do this tiny harmless thing while I'm
> here.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> Reviewed-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/iotests.py | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 51f84475d9..e6f9f62b2b 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -16,19 +16,19 @@
> # along with this program. If not, see <http://www.gnu.org/licenses/>.
> #
>
> +import atexit
> +from collections import OrderedDict
> +import faulthandler
> +import io
> +import json
> +import logging
> import os
> import re
> +import signal
> +import struct
> import subprocess
> -import unittest
> import sys
> -import struct
> -import json
> -import signal
> -import logging
> -import atexit
> -import io
> -from collections import OrderedDict
> -import faulthandler
> +import unittest
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> # pylint: disable=import-error, wrong-import-position
> sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
>