Merge pull request #475 from fcollonval/use-unittest-not-mock

Use standard unittest and not mock

Author: telamonian

.gitignore

@@ -107,4 +107,5 @@ node_modules/
 package-lock.json
 MANIFEST
 jupyterlab_git/labextension/*.tgz
+.pytest_cache/
 *.tsbuildinfo

jupyterlab_git/git.py

@@ -64,9 +64,8 @@ class Git:
     A single parent class containing all of the individual git methods in it.
     """
 
-    def __init__(self, root_dir, *args, **kwargs):
-        super(Git, self).__init__(*args, **kwargs)
-        self.root_dir = os.path.realpath(os.path.expanduser(root_dir))
+    def __init__(self, root_dir):
+        self.root_dir = os.path.expanduser(root_dir)
 
     def config(self, top_repo_path, **kwargs):
         """Get or set Git options.

jupyterlab_git/tests/test_branch.py

@@ -1,7 +1,7 @@
 # python lib
 import pytest
 from subprocess import PIPE
-from mock import patch, call, Mock
+from unittest.mock import patch, call, Mock
 
 # local lib
 from jupyterlab_git.git import Git

jupyterlab_git/tests/test_clone.py

@@ -1,6 +1,6 @@
 from subprocess import PIPE
 
-from mock import patch, call, Mock
+from unittest.mock import patch, call, Mock
 
 from jupyterlab_git.git import Git, GitAuthInputWrapper
 

jupyterlab_git/tests/test_config.py

@@ -1,7 +1,7 @@
 import json
 import subprocess
 
-from mock import patch, call, Mock
+from unittest.mock import patch, call, Mock
 import pytest
 
 from jupyterlab_git.git import Git

jupyterlab_git/tests/test_detailed_log.py

@@ -1,6 +1,6 @@
 # python lib
 from subprocess import PIPE
-from mock import patch, call, Mock
+from unittest.mock import patch, call, Mock
 
 # local lib
 from jupyterlab_git.git import Git

jupyterlab_git/tests/test_diff.py

@@ -1,6 +1,6 @@
 from subprocess import PIPE, STDOUT, CalledProcessError
 
-from mock import Mock, call, patch
+from unittest.mock import Mock, call, patch
 import pytest
 from tornado.web import HTTPError
 

jupyterlab_git/tests/test_handlers.py

@@ -1,5 +1,5 @@
 import json
-from mock import Mock, ANY, patch
+from unittest.mock import Mock, ANY, patch
 
 from jupyterlab_git.handlers import (
     GitAllHistoryHandler,

jupyterlab_git/tests/test_pushpull.py

@@ -1,6 +1,6 @@
 from subprocess import PIPE
 
-from mock import patch, call, Mock
+from unittest.mock import patch, call, Mock
 
 from jupyterlab_git.git import Git