Skip to contentSkip to conversation

iotests: Selfish patches

PATCH Superseded Max Reitz 5 participants 37 messages Aug 19, 2019 – Sep 17, 2019

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Max Reitz

author
#0 lore raw

v3 cover iotests: Selfish patches

Hi,

Nothing has changed too much since the previous version, thus I’ll start with a link to its cover letter:

https://lists.nongnu.org/archive/html/qemu-block/2019-06/msg01102.html

What has changed is this:

v3:
- Patches 2 and 3: Resolved rebase conflicts

- Added patch 4. It seems useful to support the new case-skipping method in @iotests.skip_if_unsupported so that annotation works even with setUp().

- Added patch 5. This has been proposed by Kevin back in v1 (for a slightly different reason, though).
Now that I added patch 4, it would be nice if I could make use of it for patches 6 and 7, but the problem is that both tests store the driver name in a class attribute. Therefore, we need patch 5 that allows us to query that attribute’s value in skip_if_unsupported().

- Patches 6 and 7: Make use of the fact that the annotation works now (Also, I dropped supported_null_drivers, because there is no point in having it – especially with patch 8.)
((Also, resolved rebase conflicts.))

- Added patch 8. It just itches me that we call qemu every time we inquire the list of supported formats, and this patch eases that itch.

git-backport-diff against v2:

Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/8:[----] [--] 'iotests: Add -display none to the qemu options' 002/8:[0004] [FC] 'iotests: Prefer null-co over null-aio' 003/8:[0003] [FC] 'iotests: Allow skipping test cases' 004/8:[down] 'iotests: Use case_skip() in skip_if_unsupported()' 005/8:[down] 'iotests: Let skip_if_unsupported() accept a method' 006/8:[0014] [FC] 'iotests: Test driver whitelisting in 093' 007/8:[0010] [FC] 'iotests: Test driver whitelisting in 136' 008/8:[down] 'iotests: Cache supported_formats()'

Max Reitz (8):
iotests: Add -display none to the qemu options
iotests: Prefer null-co over null-aio
iotests: Allow skipping test cases
iotests: Use case_skip() in skip_if_unsupported()
iotests: Let skip_if_unsupported() accept a method
iotests: Test driver whitelisting in 093
iotests: Test driver whitelisting in 136
iotests: Cache supported_formats()

 tests/qemu-iotests/093        | 19 +++++++++------
 tests/qemu-iotests/136        | 14 +++++++----
 tests/qemu-iotests/245        |  2 +-
 tests/qemu-iotests/check      |  6 ++---
 tests/qemu-iotests/iotests.py | 45 ++++++++++++++++++++++++++++-------
 5 files changed, 62 insertions(+), 24 deletions(-)
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH v3 1/8 iotests: Add -display none to the qemu options

Without this argument, qemu will print an angry message about not being able to connect to a display server if $DISPLAY is not set. For me, that breaks iotests.supported_formats() because it thus only sees ["Could", "not", "connect"] as the supported formats.

---
 tests/qemu-iotests/check | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tests/qemu-iotests/check +3 -3
index c24874ff4a..a58232eefb 100755
@@ -581,13 +581,13 @@ export QEMU_PROG="$(type -p "$QEMU_PROG")"
 
 case "$QEMU_PROG" in
     *qemu-system-arm|*qemu-system-aarch64)
-        export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -machine virt,accel=qtest"
         ;;
     *qemu-system-tricore)
-        export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard,accel=qtest"
         ;;
     *)
-        export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -machine accel=qtest"
         ;;
 esac
 
Signature · 1 line
2.21.0
Reviewed-by on v3 1/8
#2 lore raw

Re: [Qemu-devel] [PATCH v3 1/8] iotests: Add -display none to the qemu options

Quoted 21 lines · Max Reitz

Without this argument, qemu will print an angry message about not being able to connect to a display server if $DISPLAY is not set. For me, that breaks iotests.supported_formats() because it thus only sees ["Could", "not", "connect"] as the supported formats.

---
 tests/qemu-iotests/check | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tests/qemu-iotests/check +1 -1
index c24874ff4a..a58232eefb 100755
@@ -581,13 +581,13 @@ export QEMU_PROG="$(type -p "$QEMU_PROG")"
 
 case "$QEMU_PROG" in
     *qemu-system-arm|*qemu-system-aarch64)
-        export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -machine virt,accel=qtest"

tests/qemu-iotests/check export QEMU_PROG="$(type -p "$QEMU_PROG")" · line 592

Quoted 10 lines
tests/qemu-iotests/check +2 -2
         ;;
     *qemu-system-tricore)
-        export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard,accel=qtest"
         ;;
     *)
-        export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
+        export QEMU_OPTIONS="-nodefaults -display none -machine accel=qtest"
         ;;
 esac
author
#3 lore raw

PATCH v3 2/8 iotests: Prefer null-co over null-aio

In reply to Max Reitz

We use null-co basically everywhere in the iotests. Unless we want to test null-aio specifically, we should use it instead (for consistency).

---
 tests/qemu-iotests/093 | 7 +++----
 tests/qemu-iotests/245 | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
tests/qemu-iotests/093 +3 -4
index 3c4f5173ce..50c1e7f2ec 100755
@@ -267,13 +267,12 @@ class ThrottleTestCoroutine(ThrottleTestCase):
     test_img = "null-co://"
 
 class ThrottleTestGroupNames(iotests.QMPTestCase):
-    test_img = "null-aio://"
     max_drives = 3
 
     def setUp(self):
         self.vm = iotests.VM()
         for i in range(0, self.max_drives):
-            self.vm.add_drive(self.test_img,
+            self.vm.add_drive("null-co://",
                               "throttling.iops-total=100,file.read-zeroes=on")
         self.vm.launch()
 
@@ -376,10 +375,10 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase):
 
     def test_removable_media(self):
         # Add a couple of dummy nodes named cd0 and cd1
-        result = self.vm.qmp("blockdev-add", driver="null-aio",
+        result = self.vm.qmp("blockdev-add", driver="null-co",
                              read_zeroes=True, node_name="cd0")
         self.assert_qmp(result, 'return', {})
-        result = self.vm.qmp("blockdev-add", driver="null-aio",
+        result = self.vm.qmp("blockdev-add", driver="null-co",
                              read_zeroes=True, node_name="cd1")
         self.assert_qmp(result, 'return', {})
 
tests/qemu-iotests/245 +1 -1
index bc1ceb9792..ae169778b0 100644
@@ -598,7 +598,7 @@ class TestBlockdevReopen(iotests.QMPTestCase):
         ##################
         ###### null ######
         ##################
-        opts = {'driver': 'null-aio', 'node-name': 'root', 'size': 1024}
+        opts = {'driver': 'null-co', 'node-name': 'root', 'size': 1024}
 
         result = self.vm.qmp('blockdev-add', conv_keys = False, **opts)
         self.assert_qmp(result, 'return', {})
Signature · 1 line
2.21.0
author
#4 lore raw

Re: [Qemu-devel] [PATCH v3 2/8] iotests: Prefer null-co over null-aio

Quoted 5 lines · Max Reitz

We use null-co basically everywhere in the iotests. Unless we want to test null-aio specifically, we should use it instead (for consistency).

Hm, sorry, I just noticed that I probably should have dropped this R-b. :-/

(I mean, apart from the rebase conflict, nothing has changed, but still.)

Max

Quoted 51 lines
---
 tests/qemu-iotests/093 | 7 +++----
 tests/qemu-iotests/245 | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
tests/qemu-iotests/093 +3 -4
index 3c4f5173ce..50c1e7f2ec 100755
@@ -267,13 +267,12 @@ class ThrottleTestCoroutine(ThrottleTestCase):
     test_img = "null-co://"
 
 class ThrottleTestGroupNames(iotests.QMPTestCase):
-    test_img = "null-aio://"
     max_drives = 3
 
     def setUp(self):
         self.vm = iotests.VM()
         for i in range(0, self.max_drives):
-            self.vm.add_drive(self.test_img,
+            self.vm.add_drive("null-co://",
                               "throttling.iops-total=100,file.read-zeroes=on")
         self.vm.launch()
 
@@ -376,10 +375,10 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase):
 
     def test_removable_media(self):
         # Add a couple of dummy nodes named cd0 and cd1
-        result = self.vm.qmp("blockdev-add", driver="null-aio",
+        result = self.vm.qmp("blockdev-add", driver="null-co",
                              read_zeroes=True, node_name="cd0")
         self.assert_qmp(result, 'return', {})
-        result = self.vm.qmp("blockdev-add", driver="null-aio",
+        result = self.vm.qmp("blockdev-add", driver="null-co",
                              read_zeroes=True, node_name="cd1")
         self.assert_qmp(result, 'return', {})
 
tests/qemu-iotests/245 +1 -1
index bc1ceb9792..ae169778b0 100644
@@ -598,7 +598,7 @@ class TestBlockdevReopen(iotests.QMPTestCase):
         ##################
         ###### null ######
         ##################
-        opts = {'driver': 'null-aio', 'node-name': 'root', 'size': 1024}
+        opts = {'driver': 'null-co', 'node-name': 'root', 'size': 1024}
 
         result = self.vm.qmp('blockdev-add', conv_keys = False, **opts)
         self.assert_qmp(result, 'return', {})
#5 lore raw

Re: [Qemu-devel] [PATCH v3 2/8] iotests: Prefer null-co over null-aio

Quoted 4 lines · Max Reitz
Quoted 3 lines · Max Reitz

We use null-co basically everywhere in the iotests. Unless we want to test null-aio specifically, we should use it instead (for consistency).

Quoted 9 lines
Quoted 2 lines

Hm, sorry, I just noticed that I probably should have dropped this R-b. :-/

(I mean, apart from the rebase conflict, nothing has changed, but still.)

Max

It's fine.

Reviewed-by on v3 2/8
#6 lore raw

Re: [Qemu-devel] [PATCH v3 2/8] iotests: Prefer null-co over null-aio

In reply to Max Reitz
Quoted 48 lines · Max Reitz

We use null-co basically everywhere in the iotests. Unless we want to test null-aio specifically, we should use it instead (for consistency).

---
 tests/qemu-iotests/093 | 7 +++----
 tests/qemu-iotests/245 | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
tests/qemu-iotests/093 +3 -4
index 3c4f5173ce..50c1e7f2ec 100755
@@ -267,13 +267,12 @@ class ThrottleTestCoroutine(ThrottleTestCase):
     test_img = "null-co://"
 
 class ThrottleTestGroupNames(iotests.QMPTestCase):
-    test_img = "null-aio://"
     max_drives = 3
 
     def setUp(self):
         self.vm = iotests.VM()
         for i in range(0, self.max_drives):
-            self.vm.add_drive(self.test_img,
+            self.vm.add_drive("null-co://",
                               "throttling.iops-total=100,file.read-zeroes=on")
         self.vm.launch()
 
@@ -376,10 +375,10 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase):
 
     def test_removable_media(self):
         # Add a couple of dummy nodes named cd0 and cd1
-        result = self.vm.qmp("blockdev-add", driver="null-aio",
+        result = self.vm.qmp("blockdev-add", driver="null-co",
                              read_zeroes=True, node_name="cd0")
         self.assert_qmp(result, 'return', {})
-        result = self.vm.qmp("blockdev-add", driver="null-aio",
+        result = self.vm.qmp("blockdev-add", driver="null-co",
                              read_zeroes=True, node_name="cd1")
         self.assert_qmp(result, 'return', {})
 
tests/qemu-iotests/245 +0 -0
index bc1ceb9792..ae169778b0 100644

tests/qemu-iotests/245 class TestBlockdevReopen(iotests.QMPTestCase): · line 604

Quoted 8 lines
tests/qemu-iotests/245 +1 -1
@@ -598,7 +598,7 @@ class TestBlockdevReopen(iotests.QMPTestCase):
         ##################
         ###### null ######
         ##################
-        opts = {'driver': 'null-aio', 'node-name': 'root', 'size': 1024}
+        opts = {'driver': 'null-co', 'node-name': 'root', 'size': 1024}
 
         result = self.vm.qmp('blockdev-add', conv_keys = False, **opts)
         self.assert_qmp(result, 'return', {})
author
#7 lore raw

PATCH v3 3/8 iotests: Allow skipping test cases

In reply to Max Reitz

case_notrun() does not actually skip the current test case. It just adds a "notrun" note and then returns to the caller, who manually has to skip the test. Generally, skipping a test case is as simple as returning from the current function, but not always: For example, this model does not allow skipping tests already in the setUp() function.

Thus, add a QMPTestCase.case_skip() function that invokes case_notrun() and then self.skipTest(). To make this work, we need to filter the information on how many test cases were skipped from the unittest output.

---
 tests/qemu-iotests/iotests.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
tests/qemu-iotests/iotests.py +18 -3
index 84438e837c..2f53baf633 100644
@@ -802,6 +802,11 @@ class QMPTestCase(unittest.TestCase):
             return self.pause_wait(job_id)
         return result
 
+    def case_skip(self, reason):
+        '''Skip this test case'''
+        case_notrun(reason)
+        self.skipTest(reason)
+
 
 def notrun(reason):
     '''Skip this test suite'''
@@ -813,7 +818,10 @@ def notrun(reason):
     sys.exit(0)
 
 def case_notrun(reason):
-    '''Skip this test case'''
+    '''Mark this test case as not having been run, but do not actually
+    skip it; that is left to the caller.  See QMPTestCase.case_skip()
+    for a variant that actually skips the current test case.'''
+
     # Each test in qemu-iotests has a number ("seq")
     seq = os.path.basename(sys.argv[0])
 
@@ -904,8 +912,15 @@ def execute_unittest(output, verbosity, debug):
         unittest.main(testRunner=runner)
     finally:
         if not debug:
-            sys.stderr.write(re.sub(r'Ran (\d+) tests? in [\d.]+s',
-                                    r'Ran \1 tests', output.getvalue()))
+            out = output.getvalue()
+            out = re.sub(r'Ran (\d+) tests? in [\d.]+s', r'Ran \1 tests', out)
+
+            # Hide skipped tests from the reference output
+            out = re.sub(r'OK \(skipped=\d+\)', 'OK', out)
+            out_first_line, out_rest = out.split('\n', 1)
+            out = out_first_line.replace('s', '.') + '\n' + out_rest
+
+            sys.stderr.write(out)
 
 def execute_test(test_function=None,
                  supported_fmts=[], supported_oses=['linux'],
Signature · 1 line
2.21.0
Reviewed-by on v3 3/8
#8 lore raw

Re: [Qemu-devel] [PATCH v3 3/8] iotests: Allow skipping test cases

Quoted 6 lines · Max Reitz

case_notrun() does not actually skip the current test case. It just adds a "notrun" note and then returns to the caller, who manually has to skip the test. Generally, skipping a test case is as simple as returning from the current function, but not always: For example, this model does not allow skipping tests already in the setUp() function.

Quoted 6 lines

Thus, add a QMPTestCase.case_skip() function that invokes case_notrun() and then self.skipTest(). To make this work, we need to filter the information on how many test cases were skipped from the unittest output.

Hm, didn't someone else send a patch like this recently?

Ah, yes:
[Qemu-block] [PATCH v5 3/6] iotests: Add casenotrun report to bash tests

Oh, theirs is for bash. Moving along.

Quoted 41 lines
---
 tests/qemu-iotests/iotests.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
tests/qemu-iotests/iotests.py +11 -3
index 84438e837c..2f53baf633 100644
@@ -802,6 +802,11 @@ class QMPTestCase(unittest.TestCase):
             return self.pause_wait(job_id)
         return result
 
+    def case_skip(self, reason):
+        '''Skip this test case'''
+        case_notrun(reason)
+        self.skipTest(reason)
+
 
 def notrun(reason):
     '''Skip this test suite'''
@@ -813,7 +818,10 @@ def notrun(reason):
     sys.exit(0)
 
 def case_notrun(reason):
-    '''Skip this test case'''
+    '''Mark this test case as not having been run, but do not actually
+    skip it; that is left to the caller.  See QMPTestCase.case_skip()
+    for a variant that actually skips the current test case.'''
+
     # Each test in qemu-iotests has a number ("seq")
     seq = os.path.basename(sys.argv[0])
 
@@ -904,8 +912,15 @@ def execute_unittest(output, verbosity, debug):
         unittest.main(testRunner=runner)
     finally:
         if not debug:
-            sys.stderr.write(re.sub(r'Ran (\d+) tests? in [\d.]+s',
-                                    r'Ran \1 tests', output.getvalue()))
+            out = output.getvalue()
+            out = re.sub(r'Ran (\d+) tests? in [\d.]+s', r'Ran \1 tests', out)

tests/qemu-iotests/iotests.py def execute_unittest(output, verbosity, debug): · line 926

Quoted 10 lines
tests/qemu-iotests/iotests.py +7 -0
+
+            # Hide skipped tests from the reference output
+            out = re.sub(r'OK \(skipped=\d+\)', 'OK', out)
+            out_first_line, out_rest = out.split('\n', 1)
+            out = out_first_line.replace('s', '.') + '\n' + out_rest
+
+            sys.stderr.write(out)
 
 def execute_test(test_function=None,
                  supported_fmts=[], supported_oses=['linux'],

okey dokey.

Reviewed-by on v3 3/8
#9 lore raw

Re: [Qemu-devel] [PATCH v3 3/8] iotests: Allow skipping test cases

In reply to Max Reitz
Quoted 33 lines · Max Reitz

case_notrun() does not actually skip the current test case. It just adds a "notrun" note and then returns to the caller, who manually has to skip the test. Generally, skipping a test case is as simple as returning from the current function, but not always: For example, this model does not allow skipping tests already in the setUp() function.

Thus, add a QMPTestCase.case_skip() function that invokes case_notrun() and then self.skipTest(). To make this work, we need to filter the information on how many test cases were skipped from the unittest output.

---
  tests/qemu-iotests/iotests.py | 21 ++++++++++++++++++---
  1 file changed, 18 insertions(+), 3 deletions(-)
tests/qemu-iotests/iotests.py +5 -0
index 84438e837c..2f53baf633 100644
@@ -802,6 +802,11 @@ class QMPTestCase(unittest.TestCase):
              return self.pause_wait(job_id)
          return result
 
+    def case_skip(self, reason):
+        '''Skip this test case'''
+        case_notrun(reason)
+        self.skipTest(reason)
+
 
  def notrun(reason):
      '''Skip this test suite'''

tests/qemu-iotests/iotests.py def notrun(reason): · line 822

Quoted 6 lines
tests/qemu-iotests/iotests.py +2 -1
@@ -813,7 +818,10 @@ def notrun(reason):
      sys.exit(0)
 
  def case_notrun(reason):
-    '''Skip this test case'''
+    '''Mark this test case as not having been run, but do not actually
+    skip it; that is left to the caller.  See QMPTestCase.case_skip()

The clause "do not actually skip it" sounds like a prescription. I would like the comment to be clearer for a reader that the method is a notifier only.

Andrey

Quoted 14 lines
tests/qemu-iotests/iotests.py +4 -2
+    for a variant that actually skips the current test case.'''
+
      # Each test in qemu-iotests has a number ("seq")
      seq = os.path.basename(sys.argv[0])
 
@@ -904,8 +912,15 @@ def execute_unittest(output, verbosity, debug):
          unittest.main(testRunner=runner)
      finally:
          if not debug:
-            sys.stderr.write(re.sub(r'Ran (\d+) tests? in [\d.]+s',
-                                    r'Ran \1 tests', output.getvalue()))
+            out = output.getvalue()
+            out = re.sub(r'Ran (\d+) tests? in [\d.]+s', r'Ran \1 tests', out)

tests/qemu-iotests/iotests.py def execute_unittest(output, verbosity, debug): · line 926

Quoted 10 lines
tests/qemu-iotests/iotests.py +7 -0
+
+            # Hide skipped tests from the reference output
+            out = re.sub(r'OK \(skipped=\d+\)', 'OK', out)
+            out_first_line, out_rest = out.split('\n', 1)
+            out = out_first_line.replace('s', '.') + '\n' + out_rest
+
+            sys.stderr.write(out)
 
  def execute_test(test_function=None,
                   supported_fmts=[], supported_oses=['linux'],
Signature · 2 lines
With the best regards,
Andrey Shinkevich
author
#10 lore raw

PATCH v3 4/8 iotests: Use case_skip() in skip_if_unsupported()

In reply to Max Reitz

skip_if_unsupported() should use the stronger variant case_skip(), because this allows it to be used even with setUp() (in a meaningful way).

---
 tests/qemu-iotests/iotests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/iotests.py +1 -1
index 2f53baf633..726f904f50 100644
@@ -896,7 +896,7 @@ def skip_if_unsupported(required_formats=[], read_only=False):
             usf_list = list(set(required_formats) -
                             set(supported_formats(read_only)))
             if usf_list:
-                case_notrun('{}: formats {} are not whitelisted'.format(
+                args[0].case_skip('{}: formats {} are not whitelisted'.format(
                     args[0], usf_list))
             else:
                 return func(*args, **kwargs)
Signature · 1 line
2.21.0
#11 lore raw

Re: [Qemu-devel] [PATCH v3 4/8] iotests: Use case_skip() in skip_if_unsupported()

Quoted 15 lines · Max Reitz

skip_if_unsupported() should use the stronger variant case_skip(), because this allows it to be used even with setUp() (in a meaningful way).

---
 tests/qemu-iotests/iotests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/iotests.py +0 -0
index 2f53baf633..726f904f50 100644

tests/qemu-iotests/iotests.py def skip_if_unsupported(required_formats=[], read_only=False): · line 902

Quoted 8 lines
tests/qemu-iotests/iotests.py +1 -1
@@ -896,7 +896,7 @@ def skip_if_unsupported(required_formats=[], read_only=False):
             usf_list = list(set(required_formats) -
                             set(supported_formats(read_only)))
             if usf_list:
-                case_notrun('{}: formats {} are not whitelisted'.format(
+                args[0].case_skip('{}: formats {} are not whitelisted'.format(
                     args[0], usf_list))
             else:
                 return func(*args, **kwargs)

Should we promote args[0] to a named argument here, because we depend on it having a specific type? It's not truly as polymorphic as we're making it appear.

That type here is iotests.QMPTestCase because we're relying on case_skip being present.

def test_wrapper(test_case, *args, **kwargs):
...
return func(test_case, *args, **kwargs)

--js

author
#12 lore raw

Re: [Qemu-devel] [PATCH v3 4/8] iotests: Use case_skip() in skip_if_unsupported()

Quoted 31 lines · John Snow
Quoted 15 lines · Max Reitz

skip_if_unsupported() should use the stronger variant case_skip(), because this allows it to be used even with setUp() (in a meaningful way).

---
 tests/qemu-iotests/iotests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/iotests.py +0 -0
index 2f53baf633..726f904f50 100644

tests/qemu-iotests/iotests.py def skip_if_unsupported(required_formats=[], read_only=False): · line 902

Quoted 8 lines
tests/qemu-iotests/iotests.py +1 -1
@@ -896,7 +896,7 @@ def skip_if_unsupported(required_formats=[], read_only=False):
             usf_list = list(set(required_formats) -
                             set(supported_formats(read_only)))
             if usf_list:
-                case_notrun('{}: formats {} are not whitelisted'.format(
+                args[0].case_skip('{}: formats {} are not whitelisted'.format(
                     args[0], usf_list))
             else:
                 return func(*args, **kwargs)

Should we promote args[0] to a named argument here, because we depend on it having a specific type? It's not truly as polymorphic as we're making it appear.

Quoted 6 lines

That type here is iotests.QMPTestCase because we're relying on case_skip being present.

def test_wrapper(test_case, *args, **kwargs):
...
return func(test_case, *args, **kwargs)

That sounds good to me indeed.

(I didn’t feel too bad about it because we already use args[0] for the skip reason, but it really should be named, yes.)

Max

author
#13 lore raw

PATCH v3 5/8 iotests: Let skip_if_unsupported() accept a method

In reply to Max Reitz

This lets tests use skip_if_unsupported() with a potentially variable list of required formats.

---
 tests/qemu-iotests/iotests.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
tests/qemu-iotests/iotests.py +6 -2
index 726f904f50..8f315538e9 100644
@@ -893,8 +893,12 @@ def skip_if_unsupported(required_formats=[], read_only=False):
        Runs the test if all the required formats are whitelisted'''
     def skip_test_decorator(func):
         def func_wrapper(*args, **kwargs):
-            usf_list = list(set(required_formats) -
-                            set(supported_formats(read_only)))
+            if callable(required_formats):
+                fmts = required_formats(args[0])
+            else:
+                fmts = required_formats
+
+            usf_list = list(set(fmts) - set(supported_formats(read_only)))
             if usf_list:
                 args[0].case_skip('{}: formats {} are not whitelisted'.format(
                     args[0], usf_list))
Signature · 1 line
2.21.0
Reviewed-by on v3 5/8
#14 lore raw

Re: [Qemu-devel] [PATCH v3 5/8] iotests: Let skip_if_unsupported() accept a method

Quoted 19 lines · Max Reitz

This lets tests use skip_if_unsupported() with a potentially variable list of required formats.

---
 tests/qemu-iotests/iotests.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
tests/qemu-iotests/iotests.py +0 -1
index 726f904f50..8f315538e9 100644
@@ -893,8 +893,12 @@ def skip_if_unsupported(required_formats=[], read_only=False):
        Runs the test if all the required formats are whitelisted'''
     def skip_test_decorator(func):
         def func_wrapper(*args, **kwargs):
-            usf_list = list(set(required_formats) -

tests/qemu-iotests/iotests.py def skip_if_unsupported(required_formats=[], read_only=False): · line 904

Quoted 10 lines
tests/qemu-iotests/iotests.py +6 -1
-                            set(supported_formats(read_only)))
+            if callable(required_formats):
+                fmts = required_formats(args[0])
+            else:
+                fmts = required_formats
+
+            usf_list = list(set(fmts) - set(supported_formats(read_only)))
             if usf_list:
                 args[0].case_skip('{}: formats {} are not whitelisted'.format(
                     args[0], usf_list))

I am required to inform you that this is in direct violation of the pythonista treaty of 2007; which mandates that you try to call and fail instead of attempting to gracefully check ahead of time.

Luckily, I am not fond of such rules.

author
#15 lore raw

Re: [Qemu-devel] [PATCH v3 5/8] iotests: Let skip_if_unsupported() accept a method

Quoted 37 lines · John Snow
Quoted 19 lines · Max Reitz

This lets tests use skip_if_unsupported() with a potentially variable list of required formats.

---
 tests/qemu-iotests/iotests.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
tests/qemu-iotests/iotests.py +0 -1
index 726f904f50..8f315538e9 100644
@@ -893,8 +893,12 @@ def skip_if_unsupported(required_formats=[], read_only=False):
        Runs the test if all the required formats are whitelisted'''
     def skip_test_decorator(func):
         def func_wrapper(*args, **kwargs):
-            usf_list = list(set(required_formats) -

tests/qemu-iotests/iotests.py def skip_if_unsupported(required_formats=[], read_only=False): · line 904

Quoted 10 lines
tests/qemu-iotests/iotests.py +6 -1
-                            set(supported_formats(read_only)))
+            if callable(required_formats):
+                fmts = required_formats(args[0])
+            else:
+                fmts = required_formats
+
+            usf_list = list(set(fmts) - set(supported_formats(read_only)))
             if usf_list:
                 args[0].case_skip('{}: formats {} are not whitelisted'.format(
                     args[0], usf_list))

I am required to inform you that this is in direct violation of the pythonista treaty of 2007; which mandates that you try to call and fail instead of attempting to gracefully check ahead of time.

Quoted 1 line

Luckily, I am not fond of such rules.

:-)

I blame Kevin’s proposal. (We should always have someone on PTO to blame for everything.)

Thanks for reviewing.

Max

author
#16 lore raw

PATCH v3 6/8 iotests: Test driver whitelisting in 093

In reply to Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +9 -3
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)
     def setUp(self):
         self.vm = iotests.VM()
         for i in range(0, self.max_drives):
-            self.vm.add_drive(self.test_img, "file.read-zeroes=on")
+            self.vm.add_drive(self.test_driver + "://", "file.read-zeroes=on")
         self.vm.launch()
 
     def tearDown(self):
@@ -264,7 +268,7 @@ class ThrottleTestCase(iotests.QMPTestCase):
         self.assertEqual(self.blockstats('drive1')[0], 4096)
 
 class ThrottleTestCoroutine(ThrottleTestCase):
-    test_img = "null-co://"
+    test_driver = "null-co"
 
 class ThrottleTestGroupNames(iotests.QMPTestCase):
     max_drives = 3
@@ -425,4 +429,6 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase):
 
 
 if __name__ == '__main__':
+    if 'null-co' not in iotests.supported_formats():
+        iotests.notrun('null-co driver support missing')
     iotests.main(supported_fmts=["raw"])
Signature · 1 line
2.21.0
#17 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Quoted 46 lines · Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +7 -3
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)
     def setUp(self):
         self.vm = iotests.VM()
         for i in range(0, self.max_drives):
-            self.vm.add_drive(self.test_img, "file.read-zeroes=on")
+            self.vm.add_drive(self.test_driver + "://", "file.read-zeroes=on")
         self.vm.launch()
 
     def tearDown(self):
@@ -264,7 +268,7 @@ class ThrottleTestCase(iotests.QMPTestCase):
         self.assertEqual(self.blockstats('drive1')[0], 4096)
 
 class ThrottleTestCoroutine(ThrottleTestCase):
-    test_img = "null-co://"
+    test_driver = "null-co"
 
 class ThrottleTestGroupNames(iotests.QMPTestCase):
     max_drives = 3

tests/qemu-iotests/093 class ThrottleTestRemovableMedia(iotests.QMPTestCase): · line 434

Quoted 6 lines
tests/qemu-iotests/093 +2 -0
@@ -425,4 +429,6 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase):
 
 
 if __name__ == '__main__':
+    if 'null-co' not in iotests.supported_formats():
+        iotests.notrun('null-co driver support missing')
     iotests.main(supported_fmts=["raw"])

Maybe also mention null-co in the patch description?

Thomas

author
#18 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Quoted 49 lines · Thomas Huth
Quoted 48 lines · Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +7 -3
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)
     def setUp(self):
         self.vm = iotests.VM()
         for i in range(0, self.max_drives):
-            self.vm.add_drive(self.test_img, "file.read-zeroes=on")
+            self.vm.add_drive(self.test_driver + "://", "file.read-zeroes=on")
         self.vm.launch()
 
     def tearDown(self):
@@ -264,7 +268,7 @@ class ThrottleTestCase(iotests.QMPTestCase):
         self.assertEqual(self.blockstats('drive1')[0], 4096)
 
 class ThrottleTestCoroutine(ThrottleTestCase):
-    test_img = "null-co://"
+    test_driver = "null-co"
 
 class ThrottleTestGroupNames(iotests.QMPTestCase):
     max_drives = 3
@@ -425,4 +429,6 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase):
 
 
Quoted 6 lines

tests/qemu-iotests/093 class ThrottleTestRemovableMedia(iotests.QMPTestCase): · line 434

Quoted 4 lines
tests/qemu-iotests/093 +2 -0
 if __name__ == '__main__':
+    if 'null-co' not in iotests.supported_formats():
+        iotests.notrun('null-co driver support missing')
     iotests.main(supported_fmts=["raw"])

Maybe also mention null-co in the patch description?

I probably didn’t because I felt bad that maybe I should add a null-co check to all tests that require it... But two wrongs don’t make a right, so I’ll leave it at one wrong and put “Skip the whole test if null-co is not whitelisted.” into the commit message, yes.

Max

#19 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

In reply to Max Reitz
Quoted 21 lines · Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +1 -1
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):

tests/qemu-iotests/093 class ThrottleTestCase(iotests.QMPTestCase): · line 41

Quoted 7 lines
tests/qemu-iotests/093 +4 -0
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)

Oh, I see why you're passing args[0] back to the callback now. Why not just pass self.required_drivers and call it with no arguments instead?

You can get a bound version that way that doesn't need additional arguments, and then the callback is free to take generic callables of any kind.

Quoted 25 lines
tests/qemu-iotests/093 +4 -2
     def setUp(self):
         self.vm = iotests.VM()
         for i in range(0, self.max_drives):
-            self.vm.add_drive(self.test_img, "file.read-zeroes=on")
+            self.vm.add_drive(self.test_driver + "://", "file.read-zeroes=on")
         self.vm.launch()
 
     def tearDown(self):
@@ -264,7 +268,7 @@ class ThrottleTestCase(iotests.QMPTestCase):
         self.assertEqual(self.blockstats('drive1')[0], 4096)
 
 class ThrottleTestCoroutine(ThrottleTestCase):
-    test_img = "null-co://"
+    test_driver = "null-co"
 
 class ThrottleTestGroupNames(iotests.QMPTestCase):
     max_drives = 3
@@ -425,4 +429,6 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase):
 
 
 if __name__ == '__main__':
+    if 'null-co' not in iotests.supported_formats():
+        iotests.notrun('null-co driver support missing')
     iotests.main(supported_fmts=["raw"])
author
#20 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Quoted 35 lines · John Snow
Quoted 21 lines · Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +1 -1
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):

tests/qemu-iotests/093 class ThrottleTestCase(iotests.QMPTestCase): · line 41

Quoted 7 lines
tests/qemu-iotests/093 +4 -0
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)

Oh, I see why you're passing args[0] back to the callback now. Why not just pass self.required_drivers and call it with no arguments instead?

Quoted 3 lines

You can get a bound version that way that doesn't need additional arguments, and then the callback is free to take generic callables of any kind.

That would be nicer indeed.

Max

author
#21 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

In reply to John Snow
Quoted 35 lines · John Snow
Quoted 21 lines · Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +1 -1
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):

tests/qemu-iotests/093 class ThrottleTestCase(iotests.QMPTestCase): · line 41

Quoted 7 lines
tests/qemu-iotests/093 +4 -0
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)

Oh, I see why you're passing args[0] back to the callback now. Why not just pass self.required_drivers and call it with no arguments instead?

Quoted 3 lines

You can get a bound version that way that doesn't need additional arguments, and then the callback is free to take generic callables of any kind.

Am I doing something wrong?

I just get

+Traceback (most recent call last):
+ File "093", line 26, in <module>
+ class ThrottleTestCase(iotests.QMPTestCase):
+ File "093", line 41, in ThrottleTestCase
+ @iotests.skip_if_unsupported(self.required_drivers)
+NameError: name 'self' is not defined

this way.

Max

#22 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Quoted 51 lines · Max Reitz
Quoted 35 lines · John Snow
Quoted 21 lines · Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +1 -1
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):

tests/qemu-iotests/093 class ThrottleTestCase(iotests.QMPTestCase): · line 41

Quoted 7 lines
tests/qemu-iotests/093 +4 -0
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)

Oh, I see why you're passing args[0] back to the callback now. Why not just pass self.required_drivers and call it with no arguments instead?

Quoted 3 lines

You can get a bound version that way that doesn't need additional arguments, and then the callback is free to take generic callables of any kind.

Am I doing something wrong?

I just get

(quoted diff) +6 -0
+Traceback (most recent call last):
+  File "093", line 26, in <module>
+    class ThrottleTestCase(iotests.QMPTestCase):
+  File "093", line 41, in ThrottleTestCase
+    @iotests.skip_if_unsupported(self.required_drivers)
+NameError: name 'self' is not defined
Quoted 4 lines

this way.

Max

What was I even talking about? :\ Well.

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]

Then, you'd write:

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

And:

tests/qemu-iotests/093 class ThrottleTestCase(iotests.QMPTestCase): · line 42

Quoted 5 lines
tests/qemu-iotests/093 +4 -0
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)
     def setUp(self):

The problem is that 'self' isn't defined at the class level, so I was mistaken about being able to use it :( Python does not have a notion of a lexical constant to refer to the class being defined; and of course we do not have an instance variable at definition time.

Sorry for the wild goose chase.

It's fine as-is.

(I wanted a way to define the required_formats callback without forcing it to be a class method, but the decorator code runs at definition time and we just don't HAVE the instance; so the way you wrote it is I think the only way it CAN be written without some much nastier trickery.)

author
#23 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Quoted 67 lines · John Snow
Quoted 51 lines · Max Reitz
Quoted 35 lines · John Snow
Quoted 21 lines · Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +1 -1
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):

tests/qemu-iotests/093 class ThrottleTestCase(iotests.QMPTestCase): · line 41

Quoted 7 lines
tests/qemu-iotests/093 +4 -0
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)

Oh, I see why you're passing args[0] back to the callback now. Why not just pass self.required_drivers and call it with no arguments instead?

Quoted 3 lines

You can get a bound version that way that doesn't need additional arguments, and then the callback is free to take generic callables of any kind.

Am I doing something wrong?

I just get

(quoted diff) +6 -0
+Traceback (most recent call last):
+  File "093", line 26, in <module>
+    class ThrottleTestCase(iotests.QMPTestCase):
+  File "093", line 41, in ThrottleTestCase
+    @iotests.skip_if_unsupported(self.required_drivers)
+NameError: name 'self' is not defined
Quoted 4 lines

this way.

Max

What was I even talking about? :\ Well.

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]
Quoted 6 lines

Then, you'd write:

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Max

author
#24 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Quoted 70 lines · Max Reitz
Quoted 69 lines · John Snow
Quoted 51 lines · Max Reitz
Quoted 35 lines · John Snow
Quoted 21 lines · Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +1 -1
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):

tests/qemu-iotests/093 class ThrottleTestCase(iotests.QMPTestCase): · line 41

Quoted 7 lines
tests/qemu-iotests/093 +4 -0
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)

Oh, I see why you're passing args[0] back to the callback now. Why not just pass self.required_drivers and call it with no arguments instead?

Quoted 3 lines

You can get a bound version that way that doesn't need additional arguments, and then the callback is free to take generic callables of any kind.

Am I doing something wrong?

I just get

(quoted diff) +6 -0
+Traceback (most recent call last):
+  File "093", line 26, in <module>
+    class ThrottleTestCase(iotests.QMPTestCase):
+  File "093", line 41, in ThrottleTestCase
+    @iotests.skip_if_unsupported(self.required_drivers)
+NameError: name 'self' is not defined
Quoted 4 lines

this way.

Max

What was I even talking about? :\ Well.

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]

Then, you'd write:

Quoted 7 lines
Quoted 4 lines

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Ah, but it isn’t a constraint, but just a “type hint” and the interpreter doesn’t enforce it. How quaint.

Well, better than a comment anyway.

Max

author
#25 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Quoted 76 lines · Max Reitz
Quoted 75 lines · Max Reitz
Quoted 73 lines · John Snow
Quoted 51 lines · Max Reitz
Quoted 35 lines · John Snow
Quoted 21 lines · Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +1 -1
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):

tests/qemu-iotests/093 class ThrottleTestCase(iotests.QMPTestCase): · line 41

Quoted 7 lines
tests/qemu-iotests/093 +4 -0
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)

Oh, I see why you're passing args[0] back to the callback now. Why not just pass self.required_drivers and call it with no arguments instead?

Quoted 3 lines

You can get a bound version that way that doesn't need additional arguments, and then the callback is free to take generic callables of any kind.

Am I doing something wrong?

I just get

(quoted diff) +6 -0
+Traceback (most recent call last):
+  File "093", line 26, in <module>
+    class ThrottleTestCase(iotests.QMPTestCase):
+  File "093", line 41, in ThrottleTestCase
+    @iotests.skip_if_unsupported(self.required_drivers)
+NameError: name 'self' is not defined
Quoted 4 lines

this way.

Max

What was I even talking about? :\ Well.

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]

Then, you'd write:

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Quoted 5 lines
Quoted 2 lines

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Ah, but it isn’t a constraint, but just a “type hint” and the interpreter doesn’t enforce it. How quaint.

Oh, and they were introduced only in 3.5. Maybe that’s a tad too new.

Quoted 1 line

Well, better than a comment anyway.

So maybe not.

Max

#26 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

In reply to Max Reitz

Am 17.09.2019 um 10:18 hat Max Reitz geschrieben:

Quoted 70 lines · John Snow
Quoted 69 lines · Max Reitz
Quoted 51 lines · John Snow
Quoted 35 lines · Max Reitz
Quoted 21 lines

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +1 -1
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):

tests/qemu-iotests/093 class ThrottleTestCase(iotests.QMPTestCase): · line 41

Quoted 7 lines
tests/qemu-iotests/093 +4 -0
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)

Oh, I see why you're passing args[0] back to the callback now. Why not just pass self.required_drivers and call it with no arguments instead?

Quoted 3 lines

You can get a bound version that way that doesn't need additional arguments, and then the callback is free to take generic callables of any kind.

Am I doing something wrong?

I just get

(quoted diff) +6 -0
+Traceback (most recent call last):
+  File "093", line 26, in <module>
+    class ThrottleTestCase(iotests.QMPTestCase):
+  File "093", line 41, in ThrottleTestCase
+    @iotests.skip_if_unsupported(self.required_drivers)
+NameError: name 'self' is not defined
Quoted 4 lines

this way.

Max

What was I even talking about? :\ Well.

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]

Then, you'd write:

Quoted 7 lines
Quoted 4 lines

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Note that function annotations are Python 3 only, so we can't use that syntax yet anyway. If you want to use type hints that are understood by tools (like mypy) and compatible with Python 2, you have to use something like this (feel free to be more specific than Any):

    def func_wrapper(instance, *args, **kwargs):
        # type: (iotests.QMPTestCase, Any, Any) -> None
        [...]

Or if you only want to declare the type for one parameter:

    def func_wrapper(instance,  # type: iotests.QMPTestCase
                     *args,
                     **kwargs):
        [...]

Especially the latter syntax might be sufficiently ugly that just doing a free-form comment that can't be parsed by tools is justifiable.

Kevin

author
#27 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Quoted 76 lines · Kevin Wolf

Am 17.09.2019 um 10:18 hat Max Reitz geschrieben:

Quoted 75 lines · John Snow
Quoted 73 lines · Max Reitz
Quoted 51 lines · John Snow
Quoted 35 lines · Max Reitz
Quoted 21 lines

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/093 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tests/qemu-iotests/093 +1 -1
index 50c1e7f2ec..f03fa24a07 100755
@@ -24,7 +24,7 @@ import iotests
 nsec_per_sec = 1000000000
 
 class ThrottleTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     max_drives = 3
 
     def blockstats(self, device):

tests/qemu-iotests/093 class ThrottleTestCase(iotests.QMPTestCase): · line 41

Quoted 7 lines
tests/qemu-iotests/093 +4 -0
@@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
                 return stat['rd_bytes'], stat['rd_operations'], stat['wr_bytes'], stat['wr_operations']
         raise Exception("Device not found for blockstats: %s" % device)
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)

Oh, I see why you're passing args[0] back to the callback now. Why not just pass self.required_drivers and call it with no arguments instead?

Quoted 3 lines

You can get a bound version that way that doesn't need additional arguments, and then the callback is free to take generic callables of any kind.

Am I doing something wrong?

I just get

(quoted diff) +6 -0
+Traceback (most recent call last):
+  File "093", line 26, in <module>
+    class ThrottleTestCase(iotests.QMPTestCase):
+  File "093", line 41, in ThrottleTestCase
+    @iotests.skip_if_unsupported(self.required_drivers)
+NameError: name 'self' is not defined
Quoted 4 lines

this way.

Max

What was I even talking about? :\ Well.

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]

Then, you'd write:

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Quoted 7 lines
Quoted 2 lines

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Note that function annotations are Python 3 only, so we can't use that syntax yet anyway. If you want to use type hints that are understood by tools (like mypy) and compatible with Python 2, you have to use something like this (feel free to be more specific than Any):

Do we really feel like staying compatible with Python 2, though?

Max

#28 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Am 17.09.2019 um 13:07 hat Max Reitz geschrieben:

Quoted 20 lines · Kevin Wolf
Quoted 19 lines

Am 17.09.2019 um 10:18 hat Max Reitz geschrieben:

Quoted 17 lines · John Snow
Quoted 7 lines

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]
Quoted 6 lines

Then, you'd write:

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Quoted 6 lines
Quoted 4 lines

Note that function annotations are Python 3 only, so we can't use that syntax yet anyway. If you want to use type hints that are understood by tools (like mypy) and compatible with Python 2, you have to use something like this (feel free to be more specific than Any):

Do we really feel like staying compatible with Python 2, though?

Feel like it? No.

It's more that we are compelled to do so because we only deprecated it in 4.1.

Kevin

#29 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Quoted 26 lines · Kevin Wolf

Am 17.09.2019 um 13:07 hat Max Reitz geschrieben:

Quoted 25 lines · Kevin Wolf
Quoted 23 lines

Am 17.09.2019 um 10:18 hat Max Reitz geschrieben:

Quoted 10 lines · John Snow
Quoted 9 lines

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]

Then, you'd write:

Quoted 7 lines
Quoted 4 lines

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Note that function annotations are Python 3 only, so we can't use that syntax yet anyway. If you want to use type hints that are understood by tools (like mypy) and compatible with Python 2, you have to use something like this (feel free to be more specific than Any):

Quoted 9 lines
Quoted 1 line

Do we really feel like staying compatible with Python 2, though?

Feel like it? No.

It's more that we are compelled to do so because we only deprecated it in 4.1.

Kevin

Sorry for the impromptu lesson on type hints in 3.5! I added that in to my suggestion as a demonstrative example and didn't mean for you to use it as-is, sorry for not making that clear.

I'm confused about the Python3 deprecation timeline. Normally we'd follow our standard approach, but it does hit EOL at the end of this year, so do we drop support then, too? I have the memory of a goldfish I suppose, and can't quite remember our conclusions, if any, of previous discussions on this subject.

If we do drop python2 though, the new minimum version appears to be 3.5 because that's what ships in EPEL. That'd give us standardized type hints that we can use for static analysis tools.

#30 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Am 17.09.2019 um 15:09 hat John Snow geschrieben:

Quoted 38 lines · Kevin Wolf
Quoted 26 lines

Am 17.09.2019 um 13:07 hat Max Reitz geschrieben:

Quoted 25 lines · Kevin Wolf
Quoted 23 lines

Am 17.09.2019 um 10:18 hat Max Reitz geschrieben:

Quoted 10 lines · John Snow
Quoted 9 lines

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]

Then, you'd write:

Quoted 7 lines
Quoted 4 lines

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Note that function annotations are Python 3 only, so we can't use that syntax yet anyway. If you want to use type hints that are understood by tools (like mypy) and compatible with Python 2, you have to use something like this (feel free to be more specific than Any):

Quoted 6 lines
Quoted 1 line

Do we really feel like staying compatible with Python 2, though?

Feel like it? No.

It's more that we are compelled to do so because we only deprecated it in 4.1.

Sorry for the impromptu lesson on type hints in 3.5! I added that in to my suggestion as a demonstrative example and didn't mean for you to use it as-is, sorry for not making that clear.

Quoted 5 lines

I'm confused about the Python3 deprecation timeline. Normally we'd follow our standard approach, but it does hit EOL at the end of this year, so do we drop support then, too? I have the memory of a goldfish I suppose, and can't quite remember our conclusions, if any, of previous discussions on this subject.

It shouldn't make a difference actually because deprecation in 4.1 means that 4.2 (in December) will be the last release that must still support Python 2, and we can switch to Python 3 for 5.0.

Quoted 3 lines

If we do drop python2 though, the new minimum version appears to be 3.5 because that's what ships in EPEL. That'd give us standardized type hints that we can use for static analysis tools.

Actually I seem to remember I suggested that we should make 3.5 the minimum Python 3 version, and I thought a patch to this effect had been merged, but now I can't find any such check in configure. Maybe I should find the old thread again to see if there was any reason not to do this.

Personally, I would have preferred 3.6 because it brings in variable annotations, but I think last time the conclusion was that it would be 3.5 indeed.

Kevin

#31 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Quoted 53 lines · Kevin Wolf

Am 17.09.2019 um 15:09 hat John Snow geschrieben:

Quoted 38 lines · Kevin Wolf
Quoted 26 lines

Am 17.09.2019 um 13:07 hat Max Reitz geschrieben:

Quoted 25 lines · Kevin Wolf
Quoted 23 lines

Am 17.09.2019 um 10:18 hat Max Reitz geschrieben:

Quoted 10 lines · John Snow
Quoted 9 lines

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]

Then, you'd write:

Quoted 7 lines
Quoted 4 lines

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Note that function annotations are Python 3 only, so we can't use that syntax yet anyway. If you want to use type hints that are understood by tools (like mypy) and compatible with Python 2, you have to use something like this (feel free to be more specific than Any):

Quoted 6 lines
Quoted 1 line

Do we really feel like staying compatible with Python 2, though?

Feel like it? No.

It's more that we are compelled to do so because we only deprecated it in 4.1.

Sorry for the impromptu lesson on type hints in 3.5! I added that in to my suggestion as a demonstrative example and didn't mean for you to use it as-is, sorry for not making that clear.

Quoted 5 lines

I'm confused about the Python3 deprecation timeline. Normally we'd follow our standard approach, but it does hit EOL at the end of this year, so do we drop support then, too? I have the memory of a goldfish I suppose, and can't quite remember our conclusions, if any, of previous discussions on this subject.

It shouldn't make a difference actually because deprecation in 4.1 means that 4.2 (in December) will be the last release that must still support Python 2, and we can switch to Python 3 for 5.0.

Quoted 3 lines

If we do drop python2 though, the new minimum version appears to be 3.5 because that's what ships in EPEL. That'd give us standardized type hints that we can use for static analysis tools.

Quoted 9 lines

Actually I seem to remember I suggested that we should make 3.5 the minimum Python 3 version, and I thought a patch to this effect had been merged, but now I can't find any such check in configure. Maybe I should find the old thread again to see if there was any reason not to do this.

Personally, I would have preferred 3.6 because it brings in variable annotations, but I think last time the conclusion was that it would be 3.5 indeed.

And with variable annotations you get data classes too, I believe, which are quite handy.

Oh well.

I have a patch that replaces the configure checks, but there are a few places in docker and the EDK2 build where we require python2 still, so I have a few threads to chase down before proposing a patch.

Stay tuned, I guess.

--js

#32 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

Am 17.09.2019 um 15:44 hat John Snow geschrieben:

Quoted 61 lines · Kevin Wolf
Quoted 58 lines

Am 17.09.2019 um 15:09 hat John Snow geschrieben:

Quoted 38 lines · Kevin Wolf
Quoted 26 lines

Am 17.09.2019 um 13:07 hat Max Reitz geschrieben:

Quoted 25 lines · Kevin Wolf
Quoted 23 lines

Am 17.09.2019 um 10:18 hat Max Reitz geschrieben:

Quoted 10 lines · John Snow
Quoted 9 lines

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]

Then, you'd write:

Quoted 7 lines
Quoted 4 lines

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Note that function annotations are Python 3 only, so we can't use that syntax yet anyway. If you want to use type hints that are understood by tools (like mypy) and compatible with Python 2, you have to use something like this (feel free to be more specific than Any):

Quoted 6 lines
Quoted 1 line

Do we really feel like staying compatible with Python 2, though?

Feel like it? No.

It's more that we are compelled to do so because we only deprecated it in 4.1.

Sorry for the impromptu lesson on type hints in 3.5! I added that in to my suggestion as a demonstrative example and didn't mean for you to use it as-is, sorry for not making that clear.

Quoted 5 lines

I'm confused about the Python3 deprecation timeline. Normally we'd follow our standard approach, but it does hit EOL at the end of this year, so do we drop support then, too? I have the memory of a goldfish I suppose, and can't quite remember our conclusions, if any, of previous discussions on this subject.

It shouldn't make a difference actually because deprecation in 4.1 means that 4.2 (in December) will be the last release that must still support Python 2, and we can switch to Python 3 for 5.0.

Quoted 3 lines

If we do drop python2 though, the new minimum version appears to be 3.5 because that's what ships in EPEL. That'd give us standardized type hints that we can use for static analysis tools.

Actually I seem to remember I suggested that we should make 3.5 the minimum Python 3 version, and I thought a patch to this effect had been merged, but now I can't find any such check in configure. Maybe I should find the old thread again to see if there was any reason not to do this.

Quoted 7 lines
Quoted 4 lines

Personally, I would have preferred 3.6 because it brings in variable annotations, but I think last time the conclusion was that it would be 3.5 indeed.

And with variable annotations you get data classes too, I believe, which are quite handy.

I didn't know these. Looks convenient, only in 3.7, though. We might be there in five years.

Kevin

author
#33 lore raw

Re: [Qemu-devel] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

In reply to Kevin Wolf
Quoted 26 lines · Kevin Wolf

Am 17.09.2019 um 13:07 hat Max Reitz geschrieben:

Quoted 25 lines · Kevin Wolf
Quoted 23 lines

Am 17.09.2019 um 10:18 hat Max Reitz geschrieben:

Quoted 10 lines · John Snow
Quoted 9 lines

I'd still like to define func_wrapper with a nod to the type constraint it has:

def func_wrapper(instance: iotests.QMPTestCase, *args, **kwargs):

    [...]

Then, you'd write:

Quoted 7 lines
Quoted 4 lines

if callable(required_formats):
fmts = required_formats(instance)
else:
fmts = required_formats

Yep, that anyway. (Although I didn’t know about the “param: type” syntax and put that constraint in a comment instead. Thanks again :-))

Note that function annotations are Python 3 only, so we can't use that syntax yet anyway. If you want to use type hints that are understood by tools (like mypy) and compatible with Python 2, you have to use something like this (feel free to be more specific than Any):

Quoted 6 lines
Quoted 1 line

Do we really feel like staying compatible with Python 2, though?

Feel like it? No.

It's more that we are compelled to do so because we only deprecated it in 4.1.

Hm, yes, that’s too bad. :-)

Max

author
#34 lore raw

PATCH v3 7/8 iotests: Test driver whitelisting in 136

In reply to Max Reitz

null-aio may not be whitelisted. Skip all test cases that require it.

---
 tests/qemu-iotests/136 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
tests/qemu-iotests/136 +10 -4
index a46a7b7630..012ea111ac 100755
@@ -30,7 +30,7 @@ bad_offset = bad_sector * 512
 blkdebug_file = os.path.join(iotests.test_dir, 'blkdebug.conf')
 
 class BlockDeviceStatsTestCase(iotests.QMPTestCase):
-    test_img = "null-aio://"
+    test_driver = "null-aio"
     total_rd_bytes = 0
     total_rd_ops = 0
     total_wr_bytes = 0
@@ -67,6 +67,10 @@ sector = "%d"
 ''' % (bad_sector, bad_sector))
         file.close()
 
+    def required_drivers(self):
+        return [self.test_driver]
+
+    @iotests.skip_if_unsupported(required_drivers)
     def setUp(self):
         drive_args = []
         drive_args.append("stats-intervals.0=%d" % interval_length)
@@ -76,8 +80,8 @@ sector = "%d"
                           (self.account_failed and "on" or "off"))
         drive_args.append("file.image.read-zeroes=on")
         self.create_blkdebug_file()
-        self.vm = iotests.VM().add_drive('blkdebug:%s:%s' %
-                                         (blkdebug_file, self.test_img),
+        self.vm = iotests.VM().add_drive('blkdebug:%s:%s://' %
+                                         (blkdebug_file, self.test_driver),
                                          ','.join(drive_args))
         self.vm.launch()
         # Set an initial value for the clock
@@ -337,7 +341,9 @@ class BlockDeviceStatsTestAccountBoth(BlockDeviceStatsTestCase):
     account_failed = True
 
 class BlockDeviceStatsTestCoroutine(BlockDeviceStatsTestCase):
-    test_img = "null-co://"
+    test_driver = "null-co"
 
 if __name__ == '__main__':
+    if 'null-co' not in iotests.supported_formats():
+        iotests.notrun('null-co driver support missing')
     iotests.main(supported_fmts=["raw"])
Signature · 1 line
2.21.0
author
#35 lore raw

PATCH v3 8/8 iotests: Cache supported_formats()

In reply to Max Reitz
---
 tests/qemu-iotests/iotests.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
tests/qemu-iotests/iotests.py +11 -3
index 8f315538e9..f6492b355f 100644
@@ -884,9 +884,17 @@ def qemu_pipe(*args):
 def supported_formats(read_only=False):
     '''Set 'read_only' to True to check ro-whitelist
        Otherwise, rw-whitelist is checked'''
-    format_message = qemu_pipe("-drive", "format=help")
-    line = 1 if read_only else 0
-    return format_message.splitlines()[line].split(":")[1].split()
+
+    if not hasattr(supported_formats, "formats"):
+        supported_formats.formats = {}
+
+    if read_only not in supported_formats.formats:
+        format_message = qemu_pipe("-drive", "format=help")
+        line = 1 if read_only else 0
+        supported_formats.formats[read_only] = \
+            format_message.splitlines()[line].split(":")[1].split()
+
+    return supported_formats.formats[read_only]
 
 def skip_if_unsupported(required_formats=[], read_only=False):
     '''Skip Test Decorator
Signature · 1 line
2.21.0
Reviewed-by on v3 8/8
#36 lore raw

Re: [Qemu-devel] [PATCH v3 8/8] iotests: Cache supported_formats()

Any particular reason? I guess an "itch."

Quoted 16 lines · Max Reitz
---
 tests/qemu-iotests/iotests.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
tests/qemu-iotests/iotests.py +0 -3
index 8f315538e9..f6492b355f 100644
@@ -884,9 +884,17 @@ def qemu_pipe(*args):
 def supported_formats(read_only=False):
     '''Set 'read_only' to True to check ro-whitelist
        Otherwise, rw-whitelist is checked'''
-    format_message = qemu_pipe("-drive", "format=help")
-    line = 1 if read_only else 0
-    return format_message.splitlines()[line].split(":")[1].split()

tests/qemu-iotests/iotests.py def qemu_pipe(*args): · line 896

Quoted 10 lines
tests/qemu-iotests/iotests.py +10 -0
+
+    if not hasattr(supported_formats, "formats"):
+        supported_formats.formats = {}
+
+    if read_only not in supported_formats.formats:
+        format_message = qemu_pipe("-drive", "format=help")
+        line = 1 if read_only else 0
+        supported_formats.formats[read_only] = \
+            format_message.splitlines()[line].split(":")[1].split()
+

Seems a little odd to use a boolean as a dict key, but I guess it works and is fine.

tests/qemu-iotests/iotests.py def qemu_pipe(*args): · line 900

Quoted 5 lines
tests/qemu-iotests/iotests.py +1 -0
+    return supported_formats.formats[read_only]
 
 def skip_if_unsupported(required_formats=[], read_only=False):
     '''Skip Test Decorator

Eh, why not.