Merge pull request #80 from rackerlabs/error_checking

Introduce some more testing

Author: jarosser06

lambda_uploader/config.py

@@ -121,10 +121,13 @@ def s3_package_name(self):
 
     '''Load config ... called by init()'''
     def _load_config(self, lambda_file=None):
+        if not path.isdir(self._path):
+            raise Exception("%s not a valid function directory" % self._path)
+
         if not lambda_file:
             lambda_file = path.join(self._path, 'lambda.json')
 
-        if not path.isfile(lambda_file) or path.isdir(lambda_file):
+        if not path.isfile(lambda_file):
             raise Exception("%s not a valid configuration file" % lambda_file)
 
         with open(lambda_file) as config_file:

test/test_config.py

@@ -1,5 +1,6 @@
 from os import path
 from lambda_uploader import config
+import pytest
 
 EX_CONFIG = path.normpath(path.join(path.dirname(__file__),
                           '../test/configs'))
@@ -57,6 +58,35 @@ def test_set_publish():
 
 
 def test___getattr__():
-    cfg = config.Config(EX_CONFIG, EX_CONFIG + '/lambda.json')
+    cfg = config.Config(EX_CONFIG, path.join(EX_CONFIG, 'lambda.json'))
     assert cfg.s3_bucket is None
     assert cfg.name == 'myFunc'
+
+
+def test_invalid_config_as_dir():
+    # pass the function directory as the lambda configuration --
+    # this should not work!
+    with pytest.raises(Exception):
+        config.Config(EX_CONFIG, EX_CONFIG)
+
+
+def test_invalid_config_missing_file():
+    # try invalid file
+    with pytest.raises(Exception):
+        config.Config(EX_CONFIG, path.join(EX_CONFIG, 'pleasedontexist.json'))
+
+
+def test_invalid_config_missing_function_dir():
+    # try invalid file
+    with pytest.raises(Exception):
+        config.Config(path.join(EX_CONFIG, 'pleasedontexist_dir'))
+
+
+def test_invalid_config_missing_function_dir2():
+    with pytest.raises(Exception):
+        config.Config(
+            # invalid function dir
+            path.join(EX_CONFIG, 'pleasedontexist_dir'),
+            # valid config file
+            path.join(EX_CONFIG, 'lambda.json')
+        )