Re: [PATCH v2 8/8] iotests/129: Clean up pylint and mypy complaints

2021-01-13 Thread Vladimir Sementsov-Ogievskiy 

13.01.2021 20:57, Max Reitz wrote:

Signed-off-by: Max Reitz 
---
  tests/qemu-iotests/129 | 6 --
  tests/qemu-iotests/297 | 2 +-
  tests/qemu-iotests/297.out | 1 +
  3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129
index 6d21470cd7..64578493c1 100755
--- a/tests/qemu-iotests/129
+++ b/tests/qemu-iotests/129
@@ -20,9 +20,10 @@
  
  import os

  import iotests
-import time
  
  class TestStopWithBlockJob(iotests.QMPTestCase):

+assert iotests.test_dir is not None


Hmm. Will we have to add such assertions to all python tests to pass mypy ? 
That's not good if so..

Still, OK for now:

Reviewed-by: Vladimir Sementsov-Ogievskiy 


+
  test_img = os.path.join(iotests.test_dir, 'test.img')
  target_img = os.path.join(iotests.test_dir, 'target.img')
  base_img = os.path.join(iotests.test_dir, 'base.img')
@@ -32,7 +33,8 @@ class TestStopWithBlockJob(iotests.QMPTestCase):
  iotests.qemu_img('create', '-f', iotests.imgfmt, self.base_img, "1G")
  iotests.qemu_img('create', '-f', iotests.imgfmt, self.test_img,
   "-b", self.base_img, '-F', iotests.imgfmt)
-iotests.qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x5d 1M 128M', 
self.test_img)
+iotests.qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x5d 1M 128M',
+self.test_img)
  self.vm = iotests.VM()
  self.vm.add_object('throttle-group,id=tg0,x-bps-total=1024')
  
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297

index b1a7d6d5e8..88f00415c8 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -32,7 +32,7 @@ fi
  
  # TODO: Empty this list!

  skip_files=(
-030 040 041 044 045 055 056 057 065 093 096 118 124 129 132 136 139 147 148
+030 040 041 044 045 055 056 057 065 093 096 118 124 132 136 139 147 148
  149 151 152 155 163 165 169 194 196 199 202 203 205 206 207 208 210 211 
212
  213 216 218 219 222 224 228 234 235 236 237 238 240 242 245 246 248 255 
256
  257 258 260 262 264 266 274 277 280 281 295 296 298 299 300 302 303 304 
307
diff --git a/tests/qemu-iotests/297.out b/tests/qemu-iotests/297.out
index c5ebbf6a17..92cae940c5 100644
--- a/tests/qemu-iotests/297.out
+++ b/tests/qemu-iotests/297.out
@@ -1,5 +1,6 @@
  QA output created by 297
  Files to be checked:
+  129
209
254
283



--
Best regards,
Vladimir

Re: [PATCH v2 8/8] iotests/129: Clean up pylint and mypy complaints

2021-01-13 Thread Eric Blake 
On 1/13/21 11:57 AM, Max Reitz wrote:
> Signed-off-by: Max Reitz 
> ---
>  tests/qemu-iotests/129 | 6 --
>  tests/qemu-iotests/297 | 2 +-
>  tests/qemu-iotests/297.out | 1 +
>  3 files changed, 6 insertions(+), 3 deletions(-)
> 

Reviewed-by: Eric Blake 


> +++ b/tests/qemu-iotests/297
> @@ -32,7 +32,7 @@ fi
>  
>  # TODO: Empty this list!
>  skip_files=(
> -030 040 041 044 045 055 056 057 065 093 096 118 124 129 132 136 139 147 
> 148
> +030 040 041 044 045 055 056 057 065 093 096 118 124 132 136 139 147 148
>  149 151 152 155 163 165 169 194 196 199 202 203 205 206 207 208 210 211 
> 212
>  213 216 218 219 222 224 228 234 235 236 237 238 240 242 245 246 248 255 
> 256

Ragged right end prior to justified lines looks odd, but it's cosmetic
and not fatal to the patch.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.   +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

[PATCH v2 8/8] iotests/129: Clean up pylint and mypy complaints

2021-01-13 Thread Max Reitz 
Signed-off-by: Max Reitz 
---
 tests/qemu-iotests/129 | 6 --
 tests/qemu-iotests/297 | 2 +-
 tests/qemu-iotests/297.out | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129
index 6d21470cd7..64578493c1 100755
--- a/tests/qemu-iotests/129
+++ b/tests/qemu-iotests/129
@@ -20,9 +20,10 @@
 
 import os
 import iotests
-import time
 
 class TestStopWithBlockJob(iotests.QMPTestCase):
+assert iotests.test_dir is not None
+
 test_img = os.path.join(iotests.test_dir, 'test.img')
 target_img = os.path.join(iotests.test_dir, 'target.img')
 base_img = os.path.join(iotests.test_dir, 'base.img')
@@ -32,7 +33,8 @@ class TestStopWithBlockJob(iotests.QMPTestCase):
 iotests.qemu_img('create', '-f', iotests.imgfmt, self.base_img, "1G")
 iotests.qemu_img('create', '-f', iotests.imgfmt, self.test_img,
  "-b", self.base_img, '-F', iotests.imgfmt)
-iotests.qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x5d 1M 128M', 
self.test_img)
+iotests.qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x5d 1M 128M',
+self.test_img)
 self.vm = iotests.VM()
 self.vm.add_object('throttle-group,id=tg0,x-bps-total=1024')
 
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index b1a7d6d5e8..88f00415c8 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -32,7 +32,7 @@ fi
 
 # TODO: Empty this list!
 skip_files=(
-030 040 041 044 045 055 056 057 065 093 096 118 124 129 132 136 139 147 148
+030 040 041 044 045 055 056 057 065 093 096 118 124 132 136 139 147 148
 149 151 152 155 163 165 169 194 196 199 202 203 205 206 207 208 210 211 212
 213 216 218 219 222 224 228 234 235 236 237 238 240 242 245 246 248 255 256
 257 258 260 262 264 266 274 277 280 281 295 296 298 299 300 302 303 304 307
diff --git a/tests/qemu-iotests/297.out b/tests/qemu-iotests/297.out
index c5ebbf6a17..92cae940c5 100644
--- a/tests/qemu-iotests/297.out
+++ b/tests/qemu-iotests/297.out
@@ -1,5 +1,6 @@
 QA output created by 297
 Files to be checked:
+  129
   209
   254
   283
-- 
2.29.2