From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 4 Jun 2024 19:19:40 +0000 (+0200)
Subject: test/pybind/rbd: fix tests that compare strings with b''
X-Git-Tag: testing/wip-pdonnell-testing-20240613.014923-debug~14^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=05f7e4f2025c435dca8ae0b34f65425afbc212b5;p=ceph-ci.git

test/pybind/rbd: fix tests that compare strings with b''

assert_not_equal(b'', self.image.id()) is bogus because Image::id()
returns a string (str), not bytes.  If the types don't match, values
are guaranteed to not match.

The same goes for Image::block_name_prefix().

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py
index 0040d1e67e5..629ad84aec4 100644
--- a/src/test/pybind/test_rbd.py
+++ b/src/test/pybind/test_rbd.py
@@ -624,10 +624,14 @@ class TestImage(object):
 
     @require_new_format()
     def test_id(self):
-        assert_not_equal(b'', self.image.id())
+        id = self.image.id()
+        assert isinstance(id, str)
+        assert len(id) > 0
 
     def test_block_name_prefix(self):
-        assert_not_equal(b'', self.image.block_name_prefix())
+        block_name_prefix = self.image.block_name_prefix()
+        assert isinstance(block_name_prefix, str)
+        assert len(block_name_prefix) > 0
 
     def test_data_pool_id(self):
         assert_greater_equal(self.image.data_pool_id(), 0)