Skip to content

Commit 73cbb39

Browse files
JasperCraeghsJasperCraeghs
committed
style fixes
1 parent 95fc7d7 commit 73cbb39

File tree

2 files changed

+72
-53
lines changed

2 files changed

+72
-53
lines changed

‎src/mlx/jira_juggler/jira_juggler.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ def fetch_credentials():
4545
if not api_token:
4646
password = config('JIRA_PASSWORD', default='')
4747
if password:
48-
LOGGER.warning('Basic authentication with a JIRA password may be deprecated. '
49-
'Consider defining an API token as environment variable JIRA_API_TOKEN instead.')
48+
LOGGER.warning(
49+
'Basic authentication with a JIRA password may be deprecated. '
50+
'Consider defining an API token as environment variable JIRA_API_TOKEN instead.'
51+
)
5052
return username, password
5153
else:
5254
api_token = getpass(f'JIRA API token (or password) for {username}: ')

‎tests/test_jira_juggler.py‎

Lines changed: 68 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
import unittest
1313

1414
try:
15-
from unittest.mock import MagicMock, patch, call
15+
from unittest.mock import MagicMock, patch
1616
except ImportError:
1717
print("unittest.mock import failed")
1818
try:
19-
from mock import MagicMock, patch, call
19+
from mock import MagicMock, patch
2020
except ImportError:
2121
print("mock import failed. installing mock")
2222
import pip
2323
pip.main(['install', 'mock'])
24-
from mock import MagicMock, patch, call
24+
from mock import MagicMock, patch
2525

2626
import mlx.jira_juggler.jira_juggler as dut
2727

@@ -517,14 +517,17 @@ def test_resolved_task(self, jira_mock):
517517
'created': '2022-05-25T14:07:11.974+0200',
518518
},
519519
]
520-
jira_mock_object.enhanced_search_issues.side_effect = [[self._mock_jira_issue(self.KEY1,
521-
self.SUMMARY1,
522-
self.ASSIGNEE1,
523-
[self.ESTIMATE1, self.ESTIMATE2, self.ESTIMATE3],
524-
self.DEPENDS1,
525-
histories=histories,
526-
status="Resolved"),
527-
], []]
520+
jira_mock_object.enhanced_search_issues.side_effect = [[
521+
self._mock_jira_issue(
522+
self.KEY1,
523+
self.SUMMARY1,
524+
self.ASSIGNEE1,
525+
[self.ESTIMATE1, self.ESTIMATE2, self.ESTIMATE3],
526+
self.DEPENDS1,
527+
histories=histories,
528+
status="Resolved",
529+
),
530+
], []]
528531
issues = juggler.juggle()
529532
jira_mock_object.enhanced_search_issues.assert_called()
530533
self.assertEqual(1, len(issues))
@@ -559,14 +562,17 @@ def test_closed_task(self, jira_mock):
559562
},
560563
]
561564

562-
jira_mock_object.enhanced_search_issues.side_effect = [[self._mock_jira_issue(self.KEY1,
563-
self.SUMMARY1,
564-
self.ASSIGNEE1,
565-
[self.ESTIMATE1, None, self.ESTIMATE3],
566-
self.DEPENDS1,
567-
histories=histories,
568-
status="Closed"),
569-
], []]
565+
jira_mock_object.enhanced_search_issues.side_effect = [[
566+
self._mock_jira_issue(
567+
self.KEY1,
568+
self.SUMMARY1,
569+
self.ASSIGNEE1,
570+
[self.ESTIMATE1, None, self.ESTIMATE3],
571+
self.DEPENDS1,
572+
histories=histories,
573+
status="Closed",
574+
),
575+
], []]
570576
issues = juggler.juggle()
571577
jira_mock_object.enhanced_search_issues.assert_called()
572578
self.assertEqual(1, len(issues))
@@ -590,38 +596,49 @@ def test_depend_on_preceding(self, jira_mock):
590596
},
591597
]
592598

593-
jira_mock_object.enhanced_search_issues.side_effect = [[self._mock_jira_issue(self.KEY1,
594-
self.SUMMARY1,
595-
self.ASSIGNEE1,
596-
[self.ESTIMATE1, None, None],
597-
self.DEPENDS1,
598-
histories=histories,
599-
status="Resolved"),
600-
self._mock_jira_issue(self.KEY2,
601-
self.SUMMARY2,
602-
self.ASSIGNEE1,
603-
[self.SECS_PER_DAY * val for val in [5, 3.2, 2.4]],
604-
self.DEPENDS1,
605-
status="Open"),
606-
self._mock_jira_issue(self.KEY3,
607-
self.SUMMARY3,
608-
self.ASSIGNEE1,
609-
[self.ESTIMATE2, None, self.ESTIMATE3],
610-
self.DEPENDS2,
611-
status="Open"),
612-
self._mock_jira_issue('Different-assignee',
613-
self.SUMMARY3,
614-
self.ASSIGNEE2,
615-
[self.ESTIMATE1, None, None],
616-
self.DEPENDS1,
617-
status="Open"),
618-
self._mock_jira_issue('Last-assignee',
619-
self.SUMMARY3,
620-
self.ASSIGNEE3,
621-
[self.ESTIMATE1, None, None],
622-
[self.KEY1, self.KEY2],
623-
status="Open"),
624-
], []]
599+
jira_mock_object.enhanced_search_issues.side_effect = [[
600+
self._mock_jira_issue(
601+
self.KEY1,
602+
self.SUMMARY1,
603+
self.ASSIGNEE1,
604+
[self.ESTIMATE1, None, None],
605+
self.DEPENDS1,
606+
histories=histories,
607+
status="Resolved",
608+
),
609+
self._mock_jira_issue(
610+
self.KEY2,
611+
self.SUMMARY2,
612+
self.ASSIGNEE1,
613+
[self.SECS_PER_DAY * val for val in [5, 3.2, 2.4]],
614+
self.DEPENDS1,
615+
status="Open",
616+
),
617+
self._mock_jira_issue(
618+
self.KEY3,
619+
self.SUMMARY3,
620+
self.ASSIGNEE1,
621+
[self.ESTIMATE2, None, self.ESTIMATE3],
622+
self.DEPENDS2,
623+
status="Open",
624+
),
625+
self._mock_jira_issue(
626+
'Different-assignee',
627+
self.SUMMARY3,
628+
self.ASSIGNEE2,
629+
[self.ESTIMATE1, None, None],
630+
self.DEPENDS1,
631+
status="Open",
632+
),
633+
self._mock_jira_issue(
634+
'Last-assignee',
635+
self.SUMMARY3,
636+
self.ASSIGNEE3,
637+
[self.ESTIMATE1, None, None],
638+
[self.KEY1, self.KEY2],
639+
status="Open",
640+
),
641+
], []]
625642
issues = juggler.juggle(depend_on_preceding=True, weeklymax=1.0, current_date=parser.isoparse('2021-08-23T13:30'))
626643
jira_mock_object.enhanced_search_issues.assert_called()
627644
self.assertEqual(5, len(issues))

0 commit comments

Comments
 (0)