Add tests

Author: nagem

api/jobs/gears.py

@@ -129,10 +129,15 @@ def fill_gear_default_values(gear, config_):
     Given a gear and a config map, fill any missing keys using defaults from the gear's config
     """
 
-    for k,v in gear['gear'].get('config', {}).itervalues:
+    if config_ is None:
+        config_ = {}
+
+    for k,v in gear['gear'].get('config', {}).iteritems():
         if 'default' in v:
             config_.setdefault(k, v['default'])
 
+    return config_
+
 
 def insert_gear(doc):
     gear_tools.validate_manifest(doc['gear'])

api/jobs/queue.py

@@ -156,8 +156,7 @@ def enqueue_job(job_map, origin, perm_check_uid=None):
         if gear.get('gear', {}).get('custom', {}).get('flywheel', {}).get('invalid', False):
             raise InputValidationException('Gear marked as invalid, will not run!')
 
-        config_ = job_map.get('config', {})
-        fill_gear_default_values(gear, config_)
+        config_ = fill_gear_default_values(gear, job_map.get('config', {}))
         validate_gear_config(gear, config_)
 
         # Translate maps to FileReferences

test/unit_tests/python/test_gear_util.py

@@ -0,0 +1,56 @@
+
+import copy
+from api.jobs import gears
+
+# DISCUSS: this basically asserts that the log helper doesn't throw, which is of non-zero but questionable value.
+# Could instead be marked for pytest et. al to ignore coverage? Desirability? Compatibility?
+def test_fill_defaults():
+
+    gear_config = {
+        'key_one':      {'default': 1},
+        'key_two':      {'default': 2},
+        'key_three':    {'default': 3},
+        'key_no_de':    {}
+    }
+
+    gear = {
+        'gear': {
+            'config': gear_config
+        }
+    }
+
+    # test sending in complete config does not change
+    config = {
+        'key_one': 4,
+        'key_two': 5,
+        'key_three': 6
+    }
+
+    result = gears.fill_gear_default_values(gear, config)
+    assert result['key_one'] == 4
+    assert result['key_two'] == 5
+    assert result['key_three'] == 6
+
+    # test sending in empty config
+    result = gears.fill_gear_default_values(gear, {})
+    assert result['key_one'] == 1
+    assert result['key_two'] == 2
+    assert result['key_three'] == 3
+
+    # test sending in None config
+    result = gears.fill_gear_default_values(gear, None)
+    assert result['key_one'] == 1
+    assert result['key_two'] == 2
+    assert result['key_three'] == 3
+
+    # test sending in semi-complete config
+    config = {
+        'key_one': None,
+        'key_two': []
+        #'key_three': 6 # missing
+    }
+
+    result = gears.fill_gear_default_values(gear, config)
+    assert result['key_one'] == None
+    assert result['key_two'] == []
+    assert result['key_three'] == 3