[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 06/10] iotests.py: Add is_str()
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v3 06/10] iotests.py: Add is_str() |
Date: |
Sun, 10 Feb 2019 15:57:32 +0100 |
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>
Reviewed-by: John Snow <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 82dd096c6e..52fc77563c 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -236,6 +236,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)
--
2.20.1
- [Qemu-block] [PATCH v3 00/10] iotests: Fix some issues, Max Reitz, 2019/02/10
- [Qemu-block] [PATCH v3 01/10] iotests: Re-add filename filters, Max Reitz, 2019/02/10
- [Qemu-block] [PATCH v3 02/10] iotests: Fix 237 for Python 2.x, Max Reitz, 2019/02/10
- [Qemu-block] [PATCH v3 03/10] iotests: Remove superfluous rm from 232, Max Reitz, 2019/02/10
- [Qemu-block] [PATCH v3 04/10] iotests: Fix 232 for LUKS, Max Reitz, 2019/02/10
- [Qemu-block] [PATCH v3 05/10] iotests: Fix 207 to use QMP filters for qmp_log, Max Reitz, 2019/02/10
- [Qemu-block] [PATCH v3 06/10] iotests.py: Add is_str(),
Max Reitz <=
- [Qemu-block] [PATCH v3 07/10] iotests.py: Filter filename in any string value, Max Reitz, 2019/02/10
- [Qemu-block] [PATCH v3 08/10] iotests: Filter SSH paths, Max Reitz, 2019/02/10
- [Qemu-block] [PATCH v3 09/10] iotests: Let 045 be run concurrently, Max Reitz, 2019/02/10
- [Qemu-block] [PATCH v3 10/10] iotests.py: s/_/-/g on keys in qmp_log(), Max Reitz, 2019/02/10
- Re: [Qemu-block] [PATCH v3 00/10] iotests: Fix some issues, Max Reitz, 2019/02/13