Fix history/current related tests

Author: vtemian

gitfs/router.py

@@ -34,7 +34,7 @@
 
 class Router(object):
     def __init__(self, remote_url, repo_path, mount_path,
-                 current_path, history_path, credentials,
+                 credentials, current_path="current", history_path="history",
                  branch=None, user="root", group="root", **kwargs):
         """
         Clone repo from a remote into repo_path/<repo_name> and checkout to

gitfs/views/current.py

@@ -34,7 +34,7 @@ def __init__(self, *args, **kwargs):
         super(CurrentView, self).__init__(*args, **kwargs)
         self.dirty = {}
 
-        self.current_path = kwargs['current_path']
+        self.current_path = kwargs.get('current_path', 'current')
 
     @write_operation
     @not_in("ignore", check=["old", "new"])

gitfs/views/index.py

@@ -26,8 +26,8 @@ class IndexView(ReadOnlyView):
     def __init__(self, *args, **kwargs):
         super(ReadOnlyView, self).__init__(*args, **kwargs)
 
-        self.current_path = kwargs['current_path']
-        self.history_path = kwargs['history_path']
+        self.current_path = kwargs.get('current_path', 'current')
+        self.history_path = kwargs.get('history_path', 'history')
 
     def getattr(self, path, fh=None):
         '''

gitfs/views/passthrough.py

@@ -33,8 +33,8 @@ def __init__(self, *args, **kwargs):
         self.repo = kwargs['repo']
         self.root = kwargs['repo_path']
 
-        self.is_current_path_root = ('/' == kwargs['current_path'])
-        self.history_path = kwargs['history_path']
+        self.is_current_path_root = kwargs.get('current_path', 'current') == '/'
+        self.history_path = kwargs.get('history_path', 'history')
 
     def access(self, path, mode):
         full_path = self.repo._full_path(path)

tests/test_mount.py

@@ -45,6 +45,8 @@ def test_prepare_components(self):
             'remote_url': 'remote_url',
             'mount_point': 'mount_point',
             'username': 'user',
+            'current_path': 'current',
+            'history_path': 'history',
             'password': '',
             'ssh_key': '/home/user/.ssh/id_rsa',
             'ssh_user': 'user',
@@ -80,7 +82,7 @@ def test_prepare_components(self):
         with patch.multiple('gitfs.mounter',
                             CommitQueue=MagicMock(return_value=mocked_queue),
                             Router=MagicMock(return_value=mocked_router),
-                            routes=mocked_routes, SyncWorker=mocked_merger,
+                            prepare_routes=mocked_routes, SyncWorker=mocked_merger,
                             FetchWorker=mocked_fetcher, FUSE=mocked_fuse,
                             get_credentials=MagicMock(return_value='cred')):
 

tests/test_router.py

@@ -200,6 +200,8 @@ def test_get_view(self):
                 'ignore': mocks['repo'].ignore,
                 'repo_path': mocks['repo_path'],
                 'mount_path': mocks['mount_path'],
+                'history_path': 'history',
+                'current_path': 'current',
                 'regex': "/current",
                 'relative_path': "/",
                 'uid': 1,