tests for INIT_CONDS

Author: dwhswenson

paths_cli/parameters.py

@@ -61,6 +61,7 @@ def __init__(self, param, store, fallback=None, num_store=None):
 
     def get(self, storage, name):
         store = getattr(storage, self.store)
+        num_store = getattr(storage, self.num_store)
 
         result = None
         # if the we can get by name/number, do it
@@ -77,20 +78,23 @@ def get(self, storage, name):
                 except ValueError:
                     pass
                 else:
-                    num_store = getattr(storage, self.num_store)
                     result = num_store[num]
 
         if result is not None:
             return result
 
-        # if there's only one of them, take that
-        if len(store) == 1:
-            return store[0]
 
         # if only one is named, take it
-        named_things = [o for o in store if o.is_named]
-        if len(named_things) == 1:
-            return named_things[0]
+        if self.store != 'tags':
+            # if there's only one of them, take that
+            if len(store) == 1:
+                return store[0]
+            named_things = [o for o in store if o.is_named]
+            if len(named_things) == 1:
+                return named_things[0]
+
+        if len(num_store) == 1:
+            return num_store[0]
 
         if self.fallback:
             result = self.fallback(self, storage, name)
@@ -101,26 +105,24 @@ def get(self, storage, name):
         return result
 
 
-
 def init_traj_fallback(parameter, storage, name):
     result = None
+
     if isinstance(name, int):
         return storage.trajectories[name]
 
-    if name and os.path.isfile(name):
-        # TODO: read from file
-        pass
-
     if name is None:
         # fallback to final_conditions, initial_conditions, only trajectory
         # the "get" here may need to be changed for new storage
         for tag in ['final_conditions', 'initial_conditions']:
             result = storage.tags[tag]
             if result:
-                return [result]
+                return result
+
+        # already tried storage.samplesets
+        if len(storage.trajectories) == 1:
+            return storage.trajectories[0]
 
-        if len(storage.samplesets) == 1:
-            return [s.trajectory for s in storage.samplesets[0]]
 
 
 ENGINE = OPSStorageLoadSingle(

paths_cli/tests/test_parameters.py

@@ -200,12 +200,34 @@ def test_get(self, getter):
             'tag-initial': 'initial_conditions'
         }[getter_style]
         obj = self.PARAMETER.get(storage, get_arg)
+        assert obj == expected
+
+    @pytest.mark.parametrize("num_in_file", [1, 2, 3, 4])
+    def test_get_none(self, num_in_file):
+        stored_things = [
+            self.traj, self.sample_set, self.other_sample_set,
+            self.other_sample_set
+        ]
+        to_store = stored_things[:num_in_file]
+        filename = self._filename("init_conds_" + str(num_in_file) + ".nc")
+        storage = paths.Storage(filename, mode='w')
+        for item in to_store:
+            storage.save(item)
+
+        if num_in_file == 3:
+            storage.tags['initial_conditions'] = self.other_sample_set
+        elif num_in_file == 4:
+            storage.tags['final_conditions'] = self.other_sample_set
+            storage.tags['initial_conditions'] = self.sample_set
 
-        pytest.skip()
-        pass
+        storage.close()
+
+        st = paths.Storage(filename, mode='r')
+        obj = INIT_CONDS.get(st, None)
+        assert obj == stored_things[num_in_file - 1]
 
-    def test_get_file(self):
-        pytest.skip()
+
+        pass
 
 
 class MultiParamInstanceTest(ParamInstanceTest):