Skip to content

Commit 07dcb94

Browse files
vojtechtrefnyvojtechtrefny
committed
tests: Fix issues found by pylint
Mostly cosmetic stuff (indentation, unused variables...) but it also found few real issues like two test cases with the same name (so one of them wouldn't be executed).
1 parent 23b62eb commit 07dcb94

17 files changed

+38
-54
lines changed

‎tests/_lvm_cases.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323

2424
def _get_lvm_version():
25-
_ret, out, _err = run_command("lvm version")
26-
m = re.search(r"LVM version:\s+([\d\.]+)", out)
27-
if not m or len(m.groups()) != 1:
28-
raise RuntimeError("Failed to determine LVM version from: %s" % out)
29-
return Version(m.groups()[0])
25+
_ret, out, _err = run_command("lvm version")
26+
m = re.search(r"LVM version:\s+([\d\.]+)", out)
27+
if not m or len(m.groups()) != 1:
28+
raise RuntimeError("Failed to determine LVM version from: %s" % out)
29+
return Version(m.groups()[0])
3030

3131
LVM_VERSION = _get_lvm_version()
3232

@@ -1243,7 +1243,7 @@ def test_cache_get_pool_name(self):
12431243
self.assertEqual(BlockDev.lvm_cache_pool_name("testVG", "testLV"), cpool_name)
12441244

12451245
@tag_test(TestTags.SLOW)
1246-
def test_create_cached_lv(self):
1246+
def test_create_writecached_lv(self):
12471247
"""Verify that it is possible to create a cached LV in a single step"""
12481248

12491249
if LVM_VERSION < Version("2.03.10") and self.test_type == "dbus":
@@ -1299,7 +1299,7 @@ def test_cache_get_stats(self):
12991299
self.assertEqual(stats.mode, BlockDev.LVMCacheMode.WRITETHROUGH)
13001300

13011301
@tag_test(TestTags.SLOW)
1302-
def test_cache_get_stats(self):
1302+
def test_thinpool_cache_get_stats(self):
13031303
"""Verify that it is possible to get stats for a cached thinpool"""
13041304

13051305
succ = BlockDev.lvm_pvcreate(self.loop_dev, 0, 0, None)

‎tests/btrfs_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def setUpClass(cls):
4343
class BtrfsPluginVersionCase(BtrfsTest):
4444
@tag_test(TestTags.NOSTORAGE)
4545
def test_plugin_version(self):
46-
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.BTRFS), "libbd_btrfs.so.3")
46+
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.BTRFS), "libbd_btrfs.so.3")
4747

4848
class BtrfsTestCase(BtrfsTest):
4949

‎tests/crypto_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def setUp(self):
124124

125125
@tag_test(TestTags.NOSTORAGE)
126126
def test_plugin_version(self):
127-
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.CRYPTO), "libbd_crypto.so.3")
127+
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.CRYPTO), "libbd_crypto.so.3")
128128

129129
@tag_test(TestTags.NOSTORAGE)
130130
def test_generate_backup_passhprase(self):
@@ -1166,7 +1166,7 @@ def test_luks_set_persistent_flags(self):
11661166
BlockDev.CryptoLUKSPersistentFlags.ALLOW_DISCARDS)
11671167

11681168
@tag_test(TestTags.SLOW, TestTags.CORE)
1169-
def test_luks_set_persistent_flags(self):
1169+
def test_luks2_set_persistent_flags(self):
11701170
"""Verify that we can set flags on a LUKS 2 device"""
11711171

11721172
self._luks2_format(self.loop_devs[0], PASSWD, fast_pbkdf=True)

‎tests/dm_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def setUpClass(cls):
2525
class DevMapperPluginVersionCase(DevMapperTest):
2626
@tag_test(TestTags.NOSTORAGE)
2727
def test_plugin_version(self):
28-
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.DM), "libbd_dm.so.3")
28+
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.DM), "libbd_dm.so.3")
2929

3030
class DevMapperTestCase(DevMapperTest):
3131

‎tests/loop_test.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import os
22
import unittest
3-
import time
43
import overrides_hack
54

65
from utils import create_sparse_tempfile, TestTags, tag_test, required_plugins
76

87
import gi
9-
gi.require_version('GLib', '2.0')
108
gi.require_version('BlockDev', '3.0')
11-
from gi.repository import GLib, BlockDev
9+
from gi.repository import BlockDev
1210

1311

1412
@required_plugins(("loop",))
@@ -38,7 +36,7 @@ def _clean_up(self):
3836
class LoopPluginVersionCase(LoopTestCase):
3937
@tag_test(TestTags.NOSTORAGE)
4038
def test_plugin_version(self):
41-
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.LOOP), "libbd_loop.so.3")
39+
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.LOOP), "libbd_loop.so.3")
4240

4341

4442
class LoopTestSetupBasic(LoopTestCase):

‎tests/lvm_dbus_tests.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def setUpClass(cls):
2828
if not BlockDev.is_initialized():
2929
BlockDev.init(cls.requested_plugins, None)
3030
else:
31-
BlockDev.reinit(cls.requested_plugins, True, None)
31+
BlockDev.reinit(cls.requested_plugins, True, None)
3232

3333
try:
3434
cls.devices_avail = BlockDev.lvm_is_tech_avail(BlockDev.LVMTech.DEVICES, 0)
@@ -44,7 +44,7 @@ def setUpClass(cls):
4444

4545
@tag_test(TestTags.NOSTORAGE)
4646
def test_plugin_version(self):
47-
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.LVM), "libbd_lvm-dbus.so.3")
47+
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.LVM), "libbd_lvm-dbus.so.3")
4848

4949
@tag_test(TestTags.NOSTORAGE)
5050
def test_tech_available(self):

‎tests/lvm_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def setUpClass(cls):
3737

3838
@tag_test(TestTags.NOSTORAGE)
3939
def test_plugin_version(self):
40-
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.LVM), "libbd_lvm.so.3")
40+
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.LVM), "libbd_lvm.so.3")
4141

4242
def test_tech_available(self):
4343
"""Verify that checking lvm tool availability by technology works as expected"""

‎tests/mdraid_test.py‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,9 @@ def setUpClass(cls):
4242

4343
class MDNoDevTestCase(MDTest):
4444

45-
requested_plugins = BlockDev.plugin_specs_from_names(("mdraid",))
46-
47-
@classmethod
48-
def setUpClass(cls):
49-
if not BlockDev.is_initialized():
50-
BlockDev.init(cls.requested_plugins, None)
51-
else:
52-
BlockDev.reinit(cls.requested_plugins, True, None)
53-
5445
@tag_test(TestTags.NOSTORAGE)
5546
def test_plugin_version(self):
56-
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.MDRAID), "libbd_mdraid.so.3")
47+
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.MDRAID), "libbd_mdraid.so.3")
5748

5849
@tag_test(TestTags.NOSTORAGE)
5950
def test_get_superblock_size(self):
@@ -453,7 +444,7 @@ def test_name_node_bijection(self):
453444
with self.assertRaisesRegex(GLib.GError, r'No name'):
454445
BlockDev.md_name_from_node("no_such_node")
455446

456-
succ = BlockDev.md_deactivate("bd_test_md");
447+
succ = BlockDev.md_deactivate("bd_test_md")
457448
self.assertTrue(succ)
458449

459450
succ = BlockDev.md_destroy(self.loop_devs[0])

‎tests/mpath_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_is_mpath_member(self):
5151
class MpathNoDevTestCase(MpathTest):
5252
@tag_test(TestTags.NOSTORAGE)
5353
def test_plugin_version(self):
54-
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.MPATH), "libbd_mpath.so.3")
54+
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.MPATH), "libbd_mpath.so.3")
5555

5656
@tag_test(TestTags.NOSTORAGE)
5757
def test_get_mpath_members(self):

‎tests/nvme_test.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def setUpClass(cls):
2525
raise unittest.SkipTest("nvme executable (nvme-cli package) not found in $PATH, skipping.")
2626
if not shutil.which("nvmetcli"):
2727
raise unittest.SkipTest("nvmetcli executable not found in $PATH, skipping.")
28-
ret, out, err = run_command("modprobe nvme-fabrics")
28+
ret, _out, _err = run_command("modprobe nvme-fabrics")
2929
if ret != 0:
3030
raise unittest.SkipTest("nvme-fabrics kernel module unavailable, skipping.")
3131

@@ -44,7 +44,7 @@ def _safe_unlink(self, f):
4444
class NVMePluginVersionTestCase(NVMeTest):
4545
@tag_test(TestTags.NOSTORAGE)
4646
def test_plugin_version(self):
47-
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.NVME), "libbd_nvme.so.3")
47+
self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.NVME), "libbd_nvme.so.3")
4848

4949
@tag_test(TestTags.NOSTORAGE)
5050
def test_availability(self):
@@ -514,13 +514,11 @@ def test_host_nqn(self):
514514
self.addCleanup(write_file, HOSTNQN_PATH, saved_hostnqn)
515515
except:
516516
self.addCleanup(self._safe_unlink, HOSTNQN_PATH)
517-
pass
518517
try:
519518
saved_hostid = read_file(HOSTID_PATH)
520519
self.addCleanup(write_file, HOSTID_PATH, saved_hostid)
521520
except:
522521
self.addCleanup(self._safe_unlink, HOSTID_PATH)
523-
pass
524522

525523
self._safe_unlink(HOSTNQN_PATH)
526524
self._safe_unlink(HOSTID_PATH)

0 commit comments

Comments
 (0)