Skip to contentSkip to conversation

iotests: Remove the superfluous 2nd check for the availability of quorum

PATCH Applied Thomas Huth 4 participants 4 messages Jan 29, 2020 – Feb 6, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iotests: Remove the superfluous 2nd check for the availability of quorum

Commit d9df28e7b07 ("iotests: check whitelisted formats") added the modern @iotests.skip_if_unsupported() to the functions in this test, so we don't need the old explicit test here anymore.

---
 tests/qemu-iotests/139 | 3 ---
 1 file changed, 3 deletions(-)
tests/qemu-iotests/139 +0 -3
index cbb5a76530..2f075888ba 100755
@@ -344,9 +344,6 @@ class TestBlockdevDel(iotests.QMPTestCase):
 
     @iotests.skip_if_unsupported(['quorum'])
     def testQuorum(self):
-        if not iotests.supports_quorum():
-            return
-
         self.addQuorum('quorum0', 'node0', 'node1')
         # We cannot remove the children of a Quorum device
         self.delBlockDriverState('node0', expect_error = True)
Signature · 1 line
2.18.1
Reviewed-by Tested-by on v1 1/1
#2 lore raw
In reply to Thomas Huth
Quoted 15 lines · Thomas Huth

Commit d9df28e7b07 ("iotests: check whitelisted formats") added the modern @iotests.skip_if_unsupported() to the functions in this test, so we don't need the old explicit test here anymore.

---
  tests/qemu-iotests/139 | 3 ---
  1 file changed, 3 deletions(-)
tests/qemu-iotests/139 +0 -0
index cbb5a76530..2f075888ba 100755

tests/qemu-iotests/139 class TestBlockdevDel(iotests.QMPTestCase): · line 349

Quoted 9 lines
tests/qemu-iotests/139 +0 -3
@@ -344,9 +344,6 @@ class TestBlockdevDel(iotests.QMPTestCase):
 
      @iotests.skip_if_unsupported(['quorum'])
      def testQuorum(self):
-        if not iotests.supports_quorum():
-            return
-
          self.addQuorum('quorum0', 'node0', 'node1')
          # We cannot remove the children of a Quorum device
          self.delBlockDriverState('node0', expect_error = True)
Signature · 2 lines
With the best regards,
Andrey Shinkevich
Applied
#3 lore raw
In reply to Thomas Huth
Quoted 8 lines · Thomas Huth

Commit d9df28e7b07 ("iotests: check whitelisted formats") added the modern @iotests.skip_if_unsupported() to the functions in this test, so we don't need the old explicit test here anymore.

---
 tests/qemu-iotests/139 | 3 ---
 1 file changed, 3 deletions(-)

Thanks, applied to my block branch:

https://git.xanclic.moe/XanClic/qemu/commits/branch/block

Max