Skip to content

Commit bfa9b0c

Browse files
authored
Fix flake8 for tests directory (patroni#3168)
Followup on patroni#3123
1 parent 416a0f7 commit bfa9b0c

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ def package_directories(self):
8888

8989
def aux_directories(self):
9090
for dir_name in ('tests', 'features'):
91+
yield dir_name
9192
for root, dirs, files in os.walk(dir_name):
9293
for name in dirs:
9394
yield os.path.join(root, name)

tests/test_ha.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,14 +584,16 @@ def test_call_failsafe_member(self):
584584
self.ha.patroni.request.return_value.status = 200
585585
with patch('patroni.ha.logger.info') as mock_logger:
586586
ret = self.ha.call_failsafe_member({}, member)
587-
self.assertEqual(mock_logger.call_args_list[0][0], ('Got response from %s %s: %s', 'test', 'http://localhost:8011/failsafe', 'Accepted'))
587+
self.assertEqual(mock_logger.call_args_list[0][0],
588+
('Got response from %s %s: %s', 'test', 'http://localhost:8011/failsafe', 'Accepted'))
588589
self.assertTrue(ret.accepted)
589590

590591
e = Exception('request failed')
591592
self.ha.patroni.request.side_effect = e
592593
with patch('patroni.ha.logger.warning') as mock_logger:
593594
ret = self.ha.call_failsafe_member({}, member)
594-
self.assertEqual(mock_logger.call_args_list[0][0], ('Request failed to %s: POST %s (%s)', 'test', 'http://localhost:8011/failsafe', e))
595+
self.assertEqual(mock_logger.call_args_list[0][0],
596+
('Request failed to %s: POST %s (%s)', 'test', 'http://localhost:8011/failsafe', e))
595597
self.assertFalse(ret.accepted)
596598

597599
@patch('time.sleep', Mock())

tests/test_patroni.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ def test_apply_dynamic_configuration(self):
106106
self.p.apply_dynamic_configuration(cluster)
107107
self.assertEqual(self.p.config._dynamic_configuration['ttl'], 40)
108108

109-
110109
@patch('sys.argv', ['patroni.py', 'postgres0.yml'])
111110
@patch('time.sleep', Mock(side_effect=SleepException))
112111
@patch.object(etcd.Client, 'delete', Mock())
@@ -320,4 +319,3 @@ def test_ensure_dcs_access(self):
320319
result = self.p.ensure_dcs_access()
321320
self.assertEqual(result, None)
322321
self.assertEqual(mock_logger.call_count, 2)
323-

tests/test_postgresql.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,7 @@ def test__load_postgres_gucs_validators(self):
11131113
file1_mock = MagicMock(**file1_attrs)
11141114
file1_mock.name = '__init__.py'
11151115
file2_attrs = {'is_file.return_value': False, 'is_dir.return_value': True,
1116-
'iterdir.side_effect': PermissionError(13, 'Permission denied')}
1116+
'iterdir.side_effect': PermissionError(13, 'Permission denied')}
11171117
file2_mock = MagicMock(**file2_attrs)
11181118
file2_mock.name = '__pycache__'
11191119
file3_attrs = {'is_file.return_value': True, 'is_dir.return_value': False}

tests/test_slots.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,8 @@ def test_advance_physical_slots(self):
321321
patch.object(SlotsHandler, 'drop_replication_slot', Mock(return_value=(True, False))), \
322322
patch('patroni.postgresql.slots.logger.warning') as mock_warning:
323323
self.s.sync_replication_slots(cluster, self.tags)
324-
self.assertEqual(mock_warning.call_args_list[-1][0], ("Unable to drop replication slot '%s', slot is active", 'test_1'))
324+
self.assertEqual(mock_warning.call_args_list[-1][0],
325+
("Unable to drop replication slot '%s', slot is active", 'test_1'))
325326

326327
with patch.object(SlotsHandler, '_query', Mock(side_effect=[[('test_1', 'physical', 1, 12345, None, None,
327328
None, None, None)], Exception])), \

0 commit comments

Comments
 (0)