fixed pytest CI

Author: telamonian

jupyterlab_git/tests/test_branch.py

@@ -423,46 +423,48 @@ def test_branch_success(mock_subproc_popen):
         'code': 0,
         'branches': [
             {
-                'is_current_branch': True,
                 'is_remote_branch': False,
                 'name': 'feature-foo',
                 'upstream': 'origin/feature-foo',
                 'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
                 'tag': None,
             },
             {
-                'is_current_branch': False,
                 'is_remote_branch': False,
                 'name': 'master',
                 'upstream': 'origin/master',
                 'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
                 'tag': None,
             },
             {
-                'is_current_branch': False,
                 'is_remote_branch': False,
                 'name': 'feature-bar',
                 'upstream': None,
                 'top_commit': '01234567899999abcdefghijklmnopqrstuvwxyz',
                 'tag': None
             },
             {
-                'is_current_branch': False,
                 'is_remote_branch': True,
                 'name': 'origin/feature-foo',
                 'upstream': None,
                 'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
                 'tag': None,
             },
             {
-                'is_current_branch': False,
                 'is_remote_branch': True,
                 'name': 'origin/master',
                 'upstream': None,
                 'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
                 'tag': None,
             }
-        ]
+        ],
+        'current_branch': {
+            'is_remote_branch': False,
+            'name': 'feature-foo',
+            'upstream': 'origin/feature-foo',
+            'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
+            'tag': None,
+        }
     }
 
     # When
@@ -561,30 +563,34 @@ def test_branch_success_detached_head(mock_subproc_popen):
         'code': 0,
         'branches': [
             {
-                'is_current_branch': False,
                 'is_remote_branch': False,
                 'name': 'master',
                 'upstream': 'origin/master',
                 'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
                 'tag': None,
             },
             {
-                'is_current_branch': True,
                 'is_remote_branch': False,
                 'name': '(HEAD detached at origin/feature-foo)',
                 'upstream': None,
                 'top_commit': None,
                 'tag': None,
             },
             {
-                'is_current_branch': False,
                 'is_remote_branch': True,
                 'name': 'origin/feature-foo',
                 'upstream': None,
                 'top_commit': 'abcdefghijklmnopqrstuvwxyz01234567890123',
                 'tag': None,
             }
-        ]
+        ],
+        'current_branch': {
+            'is_remote_branch': False,
+            'name': '(HEAD detached at origin/feature-foo)',
+            'upstream': None,
+            'top_commit': None,
+            'tag': None,
+        }
     }
 
     # When