[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [Qemu-devel] [PATCH v2 06/10] iotests.py: Add is_str()
From: |
John Snow |
Subject: |
Re: [Qemu-block] [Qemu-devel] [PATCH v2 06/10] iotests.py: Add is_str() |
Date: |
Wed, 30 Jan 2019 15:10:01 -0500 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 |
On 1/30/19 10:24 AM, Max Reitz wrote:
> On Python 2.x, strings are not always unicode strings. This function
> checks whether a given value is a plain string, or a unicode string (if
> there is a difference).
>
> Signed-off-by: Max Reitz <address@hidden>
> ---
> tests/qemu-iotests/iotests.py | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index f51456fa63..3e91444b79 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -221,6 +221,12 @@ def image_size(img):
> r = qemu_img_pipe('info', '--output=json', '-f', imgfmt, img)
> return json.loads(r)['virtual-size']
>
> +def is_str(val):
> + if sys.version_info.major >= 3:
> + return isinstance(val, str)
> + else:
> + return isinstance(val, str) or isinstance(val, unicode)
> +
> test_dir_re = re.compile(r"%s" % test_dir)
> def filter_test_dir(msg):
> return test_dir_re.sub("TEST_DIR", msg)
>
Scares me less.
Reviewed-by: John Snow <address@hidden>
- [Qemu-block] [PATCH v2 00/10] iotests: Fix some issues, Max Reitz, 2019/01/30
- [Qemu-block] [PATCH v2 01/10] iotests: Re-add filename filters, Max Reitz, 2019/01/30
- [Qemu-block] [PATCH v2 02/10] iotests: Fix 237 for Python 2.x, Max Reitz, 2019/01/30
- [Qemu-block] [PATCH v2 03/10] iotests: Remove superfluous rm from 232, Max Reitz, 2019/01/30
- [Qemu-block] [PATCH v2 04/10] iotests: Fix 232 for LUKS, Max Reitz, 2019/01/30
- [Qemu-block] [PATCH v2 05/10] iotests: Fix 207 to use QMP filters for qmp_log, Max Reitz, 2019/01/30
- [Qemu-block] [PATCH v2 06/10] iotests.py: Add is_str(), Max Reitz, 2019/01/30
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 06/10] iotests.py: Add is_str(),
John Snow <=
- [Qemu-block] [PATCH v2 07/10] iotests.py: Filter filename in any string value, Max Reitz, 2019/01/30
- [Qemu-block] [PATCH v2 09/10] iotests: Let 045 be run concurrently, Max Reitz, 2019/01/30
- [Qemu-block] [PATCH v2 08/10] iotests: Filter SSH paths, Max Reitz, 2019/01/30
- [Qemu-block] [PATCH v2 10/10] iotests.py: s/_/-/g on keys in qmp_log(), Max Reitz, 2019/01/30