Skip to content

Commit b7adda5

Browse files
Format merge tests with black
Co-authored-by: balajirajput96 <124477404+balajirajput96@users.noreply.github.com>
1 parent 7f08480 commit b7adda5

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

jupyterlab_git/tests/test_handlers.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,10 +1096,7 @@ async def test_merge_handler_success(mock_git, jp_fetch, jp_root_dir):
10961096
# Given
10971097
local_path = jp_root_dir / "test_path"
10981098
branch_to_merge = "feature-branch"
1099-
merge_result = {
1100-
"code": 0,
1101-
"message": "Merge made by the 'ort' strategy."
1102-
}
1099+
merge_result = {"code": 0, "message": "Merge made by the 'ort' strategy."}
11031100
mock_git.merge.return_value = maybe_future(merge_result)
11041101

11051102
# When
@@ -1123,7 +1120,7 @@ async def test_merge_handler_conflict(mock_git, jp_fetch, jp_root_dir):
11231120
merge_result = {
11241121
"code": 1,
11251122
"command": "git merge conflicting-branch",
1126-
"message": "Automatic merge failed; fix conflicts and then commit the result."
1123+
"message": "Automatic merge failed; fix conflicts and then commit the result.",
11271124
}
11281125
mock_git.merge.return_value = maybe_future(merge_result)
11291126

0 commit comments

Comments
 (0)