Skip to content

Commit ffada26

Browse files
style: apply pre-commit hooks repository-wide (#396)
Co-authored-by: markuslf <31855393+markuslf@users.noreply.github.com>
1 parent 33daed3 commit ffada26

14 files changed

Lines changed: 122 additions & 80 deletions

File tree

  • tests
    • bexio/unit-test
    • db_mysql/unit-test
    • huawei_pacific/unit-test
    • infomaniak/unit-test
    • keycloak/unit-test
    • kvm/unit-test
    • librenms/unit-test
    • net/unit-test
    • nodebb/unit-test
    • psutil/unit-test
    • redfish/unit-test
    • version/unit-test
    • wildfly/unit-test
    • wordpress/unit-test

‎tests/bexio/unit-test/run‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -457,9 +457,7 @@ class TestEveryWrapperTargetsItsEndpoint(BexioTestBase):
457457
self.fetch_json.return_value = (True, [])
458458
func(API_TOKEN)
459459
self.assertTrue(
460-
self.sent_url().startswith(
461-
f'{bexio.BEXIO_API_BASE_URL}{path}?'
462-
),
460+
self.sent_url().startswith(f'{bexio.BEXIO_API_BASE_URL}{path}?'),
463461
self.sent_url(),
464462
)
465463

@@ -479,9 +477,7 @@ class TestEveryWrapperTargetsItsEndpoint(BexioTestBase):
479477
with self.subTest(func=func.__name__):
480478
self.fetch_json.reset_mock()
481479
self.fetch_json.return_value = (False, 'HTTP 401: invalid token')
482-
self.assertEqual(
483-
func(API_TOKEN), (False, 'HTTP 401: invalid token')
484-
)
480+
self.assertEqual(func(API_TOKEN), (False, 'HTTP 401: invalid token'))
485481

486482
def test_every_creator_posts_its_payload(self):
487483
for func, path in self.CREATORS:
@@ -490,9 +486,7 @@ class TestEveryWrapperTargetsItsEndpoint(BexioTestBase):
490486
self.fetch_json.return_value = (True, {'id': 42})
491487
payload = {'name': 'linuxfabrik'}
492488
func(API_TOKEN, data=payload)
493-
self.assertEqual(
494-
self.sent_url(), f'{bexio.BEXIO_API_BASE_URL}{path}'
495-
)
489+
self.assertEqual(self.sent_url(), f'{bexio.BEXIO_API_BASE_URL}{path}')
496490
self.assertEqual(self.sent_kwargs()['data'], payload)
497491
self.assertIsNone(self.sent_kwargs()['method'])
498492

@@ -502,13 +496,13 @@ class TestEveryWrapperTargetsItsEndpoint(BexioTestBase):
502496
self.fetch_json.reset_mock()
503497
self.fetch_json.return_value = (True, {'id': 7})
504498
func(API_TOKEN, 7, {'name': 'linuxfabrik'})
505-
self.assertEqual(
506-
self.sent_url(), f'{bexio.BEXIO_API_BASE_URL}{path}/7'
507-
)
499+
self.assertEqual(self.sent_url(), f'{bexio.BEXIO_API_BASE_URL}{path}/7')
508500

509501
def test_every_wrapper_is_in_the_table(self):
510502
# a wrapper added later has to be added here too, or this fails
511-
covered = {func.__name__ for func, _ in self.READERS + self.CREATORS + self.EDITORS}
503+
covered = {
504+
func.__name__ for func, _ in self.READERS + self.CREATORS + self.EDITORS
505+
}
512506
covered |= {'call_api', 'get_all', 'delete_contact_relation'}
513507
public = {
514508
name

‎tests/db_mysql/unit-test/run‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ class TestLod2Dict(unittest.TestCase):
136136
class TestCheckPrivileges(unittest.TestCase):
137137
"""The grant parsing, driven through a mocked select(), no server needed."""
138138

139-
GRANTS: typing.ClassVar = [{'Grants for u@h': "GRANT SELECT, PROCESS ON *.* TO `u`@`h`"}]
139+
GRANTS: typing.ClassVar = [
140+
{'Grants for u@h': 'GRANT SELECT, PROCESS ON *.* TO `u`@`h`'}
141+
]
140142

141143
def _with_grants(self, grants):
142144
return mock.patch.object(db_mysql, 'select', return_value=(True, grants))
@@ -209,6 +211,7 @@ class TestCheckPrivileges(unittest.TestCase):
209211
self.assertFalse(success)
210212
self.assertEqual(message, 'gone away')
211213

214+
212215
class TestGetFlavor(unittest.TestCase):
213216
def test_reports_the_flavor_of_the_server_info(self):
214217
with mock.patch.object(

‎tests/huawei_pacific/unit-test/run‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -731,9 +731,12 @@ class TestGetClusterNodes(unittest.TestCase):
731731
return {'data': nodes, 'result': {'code': 0}}
732732

733733
def _nodes(self, nodes):
734-
with mock.patch.object(
735-
huawei_pacific, 'get_data', return_value=self._envelope(nodes)
736-
), mock.patch.object(huawei_pacific, '_assert_all_nodes_listed'):
734+
with (
735+
mock.patch.object(
736+
huawei_pacific, 'get_data', return_value=self._envelope(nodes)
737+
),
738+
mock.patch.object(huawei_pacific, '_assert_all_nodes_listed'),
739+
):
737740
return huawei_pacific.get_cluster_nodes(Args())
738741

739742
def test_keeps_a_node_in_the_cluster_and_one_that_says_nothing(self):
@@ -805,9 +808,7 @@ class TestPureHelpers(unittest.TestCase):
805808
self.assertEqual(huawei_pacific.get_password_status(99), 'Unknown')
806809

807810
def test_warranty_status(self):
808-
self.assertEqual(
809-
huawei_pacific.get_warranty_status(0), 'non-storage node (0)'
810-
)
811+
self.assertEqual(huawei_pacific.get_warranty_status(0), 'non-storage node (0)')
811812
self.assertEqual(
812813
huawei_pacific.get_warranty_status(1), 'normal, more than six months (1)'
813814
)

‎tests/infomaniak/unit-test/run‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,7 @@ class TestGetEvents(InfomaniakTestCase):
245245
def test_proxy_forwarded(self):
246246
m = self.patch_fetch(ok(EVENTS_SUCCESS))
247247
infomaniak.get_events('TOK', proxy='http://proxy.example.com:3128')
248-
self.assertEqual(
249-
m.call_args.kwargs['proxy'], 'http://proxy.example.com:3128'
250-
)
248+
self.assertEqual(m.call_args.kwargs['proxy'], 'http://proxy.example.com:3128')
251249

252250
def test_proxy_defaults_to_none(self):
253251
m = self.patch_fetch(ok(EVENTS_SUCCESS))

‎tests/keycloak/unit-test/run‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,9 @@ class TestGetServerInfoSection(unittest.TestCase):
715715

716716
def test_returns_the_section(self):
717717
self.assertEqual(
718-
keycloak.get_server_info_section({'memoryInfo': {'total': 1}}, 'memoryInfo'),
718+
keycloak.get_server_info_section(
719+
{'memoryInfo': {'total': 1}}, 'memoryInfo'
720+
),
719721
(True, {'total': 1}),
720722
)
721723

‎tests/kvm/unit-test/run‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class TestParseDomstats(unittest.TestCase):
7474
self.assertIn('db 01', kvm.parse_domstats(DOMSTATS))
7575

7676
def test_digits_become_int_everything_else_stays_text(self):
77-
stats = kvm.parse_domstats(DOMSTATS + " block.0.name=vda\n")
77+
stats = kvm.parse_domstats(DOMSTATS + ' block.0.name=vda\n')
7878
self.assertEqual(stats['db 01']['balloon.current'], 1048576)
7979
self.assertEqual(stats['db 01']['block.0.name'], 'vda')
8080

@@ -148,8 +148,10 @@ class TestGroupByStore(unittest.TestCase):
148148

149149
class TestVirsh(unittest.TestCase):
150150
def test_connects_read_only_to_the_uri(self):
151-
with mock.patch.object(kvm.shell, 'which', return_value='/usr/bin/virsh'), \
152-
_virsh(stdout='ok') as exec_mock:
151+
with (
152+
mock.patch.object(kvm.shell, 'which', return_value='/usr/bin/virsh'),
153+
_virsh(stdout='ok') as exec_mock,
154+
):
153155
success, stdout = kvm.virsh(['list', '--all'], uri='qemu:///system')
154156
self.assertTrue(success)
155157
self.assertEqual(stdout, 'ok')
@@ -164,17 +166,21 @@ class TestVirsh(unittest.TestCase):
164166
self.assertIn('libvirt-client', message)
165167

166168
def test_a_non_zero_return_code_is_explained(self):
167-
with mock.patch.object(kvm.shell, 'which', return_value='/usr/bin/virsh'), \
168-
_virsh(stderr='error: failed to connect to the hypervisor', retc=1):
169+
with (
170+
mock.patch.object(kvm.shell, 'which', return_value='/usr/bin/virsh'),
171+
_virsh(stderr='error: failed to connect to the hypervisor', retc=1),
172+
):
169173
success, message = kvm.virsh(['list'])
170174
self.assertFalse(success)
171175
self.assertNotEqual(message, '')
172176

173177
def test_a_failed_call_is_passed_on(self):
174-
with mock.patch.object(kvm.shell, 'which', return_value='/usr/bin/virsh'), \
175-
mock.patch.object(
176-
kvm.shell, 'shell_exec', return_value=(False, 'timed out')
177-
):
178+
with (
179+
mock.patch.object(kvm.shell, 'which', return_value='/usr/bin/virsh'),
180+
mock.patch.object(
181+
kvm.shell, 'shell_exec', return_value=(False, 'timed out')
182+
),
183+
):
178184
self.assertEqual(kvm.virsh(['list']), (False, 'timed out'))
179185

180186

‎tests/librenms/unit-test/run‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,7 @@ class TestGetDataRequest(LibrenmsTestBase):
213213
PROXY = 'http://proxy.example.com:3128'
214214

215215
librenms.get_data(A(), uri='/x')
216-
self.assertEqual(
217-
self.sent_kwargs()['proxy'], 'http://proxy.example.com:3128'
218-
)
216+
self.assertEqual(self.sent_kwargs()['proxy'], 'http://proxy.example.com:3128')
219217

220218
def test_proxy_defaults_to_none(self):
221219
librenms.get_data(Args(), uri='/x')

‎tests/net/unit-test/run‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,9 @@ class TestFetch(unittest.TestCase):
244244
self.assertEqual(sock.sent, [b'EHLO x\r\n'])
245245

246246
def test_dialog_reports_a_connection_closed_before_the_pattern(self):
247-
success, message = self._fetch(FakeSocket([b'220 ready\n']),
248-
dialog=[(None, '250')])
247+
success, message = self._fetch(
248+
FakeSocket([b'220 ready\n']), dialog=[(None, '250')]
249+
)
249250
self.assertFalse(success)
250251
self.assertIn('closed before pattern', message)
251252

@@ -411,12 +412,14 @@ class TestGetNetinfo(unittest.TestCase):
411412
self.assertEqual(net.get_netinfo(), [])
412413

413414
def test_reports_the_address_of_the_default_route(self):
414-
with mock.patch.object(net, 'HAVE_PSUTIL', True), \
415-
mock.patch.object(net, '_default_route_ip', return_value='192.0.2.10'), \
416-
mock.patch.object(
417-
net, '_iface_for_ip', return_value=('eth0', '255.255.255.0')
418-
), \
419-
mock.patch.object(net, '_default_gateway', return_value='192.0.2.1'):
415+
with (
416+
mock.patch.object(net, 'HAVE_PSUTIL', True),
417+
mock.patch.object(net, '_default_route_ip', return_value='192.0.2.10'),
418+
mock.patch.object(
419+
net, '_iface_for_ip', return_value=('eth0', '255.255.255.0')
420+
),
421+
mock.patch.object(net, '_default_gateway', return_value='192.0.2.1'),
422+
):
420423
netinfo = net.get_netinfo()
421424
self.assertEqual(netinfo['address'], '192.0.2.10')
422425
self.assertEqual(netinfo['mask'], '255.255.255.0')
@@ -426,8 +429,10 @@ class TestGetNetinfo(unittest.TestCase):
426429
self.assertIsNone(netinfo['public_address'])
427430

428431
def test_without_a_default_route_it_returns_an_empty_list(self):
429-
with mock.patch.object(net, 'HAVE_PSUTIL', True), \
430-
mock.patch.object(net, '_default_route_ip', return_value=None):
432+
with (
433+
mock.patch.object(net, 'HAVE_PSUTIL', True),
434+
mock.patch.object(net, '_default_route_ip', return_value=None),
435+
):
431436
self.assertEqual(net.get_netinfo(), [])
432437

433438

@@ -441,7 +446,9 @@ class TestGetSubnetHosts(unittest.TestCase):
441446
return have, module
442447

443448
def test_lists_the_hosts_of_the_interface_subnet(self):
444-
addr = mock.Mock(family=net.AF_INET, address='192.0.2.1', netmask='255.255.255.0')
449+
addr = mock.Mock(
450+
family=net.AF_INET, address='192.0.2.1', netmask='255.255.255.0'
451+
)
445452
have, module = self._interfaces({'eth0': [addr]})
446453
with have, module:
447454
success, hosts = net.get_subnet_hosts('eth0')
@@ -451,21 +458,27 @@ class TestGetSubnetHosts(unittest.TestCase):
451458

452459
def test_without_an_interface_it_asks_get_netinfo(self):
453460
netinfo = {'address': '192.0.2.1', 'mask_cidr': 24}
454-
with mock.patch.object(net, 'HAVE_PSUTIL', True), \
455-
mock.patch.object(net, 'get_netinfo', return_value=netinfo):
461+
with (
462+
mock.patch.object(net, 'HAVE_PSUTIL', True),
463+
mock.patch.object(net, 'get_netinfo', return_value=netinfo),
464+
):
456465
success, hosts = net.get_subnet_hosts()
457466
self.assertTrue(success, hosts)
458467
self.assertEqual(len(hosts), 254)
459468

460469
def test_without_a_default_route_it_says_so(self):
461-
with mock.patch.object(net, 'HAVE_PSUTIL', True), \
462-
mock.patch.object(net, 'get_netinfo', return_value=[]):
470+
with (
471+
mock.patch.object(net, 'HAVE_PSUTIL', True),
472+
mock.patch.object(net, 'get_netinfo', return_value=[]),
473+
):
463474
success, message = net.get_subnet_hosts()
464475
self.assertFalse(success)
465476
self.assertIn('default interface', message)
466477

467478
def test_max_hosts_is_honoured(self):
468-
addr = mock.Mock(family=net.AF_INET, address='192.0.2.1', netmask='255.255.255.0')
479+
addr = mock.Mock(
480+
family=net.AF_INET, address='192.0.2.1', netmask='255.255.255.0'
481+
)
469482
have, module = self._interfaces({'eth0': [addr]})
470483
with have, module:
471484
success, message = net.get_subnet_hosts('eth0', max_hosts=10)
@@ -485,5 +498,6 @@ class TestGetSubnetHosts(unittest.TestCase):
485498
self.assertFalse(success)
486499
self.assertIn('psutil', message)
487500

501+
488502
if __name__ == '__main__':
489503
unittest.main()

‎tests/nodebb/unit-test/run‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,7 @@ class TestGetDataRequestShape(NodebbTestCase):
267267
def test_proxy_forwarded(self):
268268
m = self.patch_fetch(ok(POSTS_SUCCESS))
269269
nodebb.get_data(Args(proxy='http://proxy.example.com:3128'), uri='/api')
270-
self.assertEqual(
271-
m.call_args.kwargs['proxy'], 'http://proxy.example.com:3128'
272-
)
270+
self.assertEqual(m.call_args.kwargs['proxy'], 'http://proxy.example.com:3128')
273271

274272
def test_proxy_defaults_to_none(self):
275273
m = self.patch_fetch(ok(POSTS_SUCCESS))

‎tests/psutil/unit-test/run‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,16 @@ class TestGetProcessAccounts(unittest.TestCase):
216216
links = links or {}
217217
with (
218218
mock.patch.object(
219-
lib_psutil.psutil, 'process_iter',
219+
lib_psutil.psutil,
220+
'process_iter',
220221
return_value=self._procs() if procs is None else list(procs),
221222
),
222223
mock.patch.object(
223224
lib_psutil.user, 'own_mount_namespace', return_value=namespace
224225
),
225226
mock.patch.object(
226-
lib_psutil.os, 'readlink',
227+
lib_psutil.os,
228+
'readlink',
227229
side_effect=lambda path: links.get(path, namespace),
228230
),
229231
):
@@ -248,8 +250,7 @@ class TestGetProcessAccounts(unittest.TestCase):
248250

249251
def test_a_generator_is_accepted(self):
250252
# The names are consumed more than once, so an iterator has to survive.
251-
self.assertEqual(self._run(n for n in ('httpd',)),
252-
['root', 'apache', 'apache'])
253+
self.assertEqual(self._run(n for n in ('httpd',)), ['root', 'apache', 'apache'])
253254

254255
def test_a_foreign_mount_namespace_is_left_out(self):
255256
# The same program in a container shows up in the host's process list
@@ -262,8 +263,9 @@ class TestGetProcessAccounts(unittest.TestCase):
262263

263264
def test_without_a_namespace_nothing_is_filtered(self):
264265
# Not Linux: the kernel publishes none, so every process counts.
265-
self.assertEqual(self._run(('httpd',), namespace=None),
266-
['root', 'apache', 'apache'])
266+
self.assertEqual(
267+
self._run(('httpd',), namespace=None), ['root', 'apache', 'apache']
268+
)
267269

268270
def test_a_process_that_vanished_is_skipped(self):
269271
procs = [_Proc('httpd', 10, 'root'), _Vanished('httpd', 11, 'apache')]

0 commit comments

Comments
 (0)