error with InvalidProjectPathException rather than create path. fix i…

…ssue #1
datmo · Apr 23, 2018 · 284a5be · 284a5be
1 parent ef34c9d
commit 284a5be
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/datmo/core/controller/base.py b/datmo/core/controller/base.py
@@ -43,18 +43,17 @@ class BaseController(object):
         Return the config dictionary based on key
     get_config_defaults()
         Return the configuration defaults
-
     """
 
     def __init__(self, home):
         self.home = home
+        if not os.path.isdir(self.home):
+            raise InvalidProjectPathException(__("error",
+                                                 "controller.base.__init__",
+                                                 home))
         self.config = JSONStore(os.path.join(self.home,
                                              ".datmo",
                                              ".config"))
-        if not os.path.isdir(self.home):
-            raise InvalidProjectPathException(__("error",
-                                                "controller.base.__init__",
-                                                home))
         # property caches and initial values
         self._dal = None
         self._model = None

diff --git a/datmo/core/controller/code/driver/git.py b/datmo/core/controller/code/driver/git.py
@@ -25,8 +25,8 @@ def __init__(self, filepath, execpath, remote_url=None):
         # Check if filepath exists
         if not os.path.exists(self.filepath):
             raise DoesNotExistException(__("error",
-                                          "controller.code.driver.git.__init__.dne",
-                                          filepath))
+                                           "controller.code.driver.git.__init__.dne",
+                                           filepath))
         self.execpath = execpath
         # Check the execpath and the version
         try:

diff --git a/datmo/core/controller/file/driver/local.py b/datmo/core/controller/file/driver/local.py
@@ -22,8 +22,8 @@ def __init__(self, filepath):
         # Check if filepath exists
         if not os.path.exists(self.filepath):
             raise DoesNotExistException(__("error",
-                                          "controller.file.driver.local.__init__",
-                                          filepath))
+                                           "controller.file.driver.local.__init__",
+                                           filepath))
         self._is_initialized = self.is_initialized
         self.type = "local"
 

diff --git a/datmo/core/controller/test/test_base.py b/datmo/core/controller/test/test_base.py
@@ -11,7 +11,7 @@
 from datmo.core.controller.base import BaseController
 from datmo.core.controller.code.driver.git import GitCodeDriver
 from datmo.core.util.exceptions import  \
-    DatmoModelNotInitializedException
+    DatmoModelNotInitializedException, InvalidProjectPathException
 
 
 class TestBaseController():
@@ -21,11 +21,19 @@ def setup_method(self):
         test_datmo_dir = os.environ.get('TEST_DATMO_DIR',
                                         tempfile.gettempdir())
         self.temp_dir = tempfile.mkdtemp(dir=test_datmo_dir)
-        self.base = BaseController(self.temp_dir)
+        self.base = BaseController(home=self.temp_dir)
 
     def teardown_method(self):
         shutil.rmtree(self.temp_dir)
 
+    def test_failed_controller_instantiation(self):
+        failed = False
+        try:
+            BaseController(home=os.path.join("does", "not", "exist"))
+        except InvalidProjectPathException:
+            failed = True
+        assert failed
+
     def test_instantiation(self):
         assert self.base != None
 

diff --git a/datmo/test/test_snapshot.py b/datmo/test/test_snapshot.py
@@ -8,7 +8,7 @@
 from datmo.snapshot import create, ls
 from datmo.core.controller.project import ProjectController
 from datmo.core.util.exceptions import GitCommitDoesNotExist, \
-    ProjectNotInitializedException, SessionDoesNotExistException
+    InvalidProjectPathException, SessionDoesNotExistException
 
 
 class TestSnapshotModule():
@@ -30,7 +30,7 @@ def test_create(self):
         try:
             create(message="test",
                    home=os.path.join("does","not", "exist"))
-        except ProjectNotInitializedException:
+        except InvalidProjectPathException:
             failed = True
         assert failed
 
@@ -79,7 +79,7 @@ def test_ls(self):
         failed = False
         try:
             ls(home=os.path.join("does","not", "exist"))
-        except ProjectNotInitializedException:
+        except InvalidProjectPathException:
             failed = True
         assert failed