Fixed flake/test and one small issue with get_es_metadata

4dn-dcic · Jul 16, 2018 · bb039c4 · bb039c4
1 parent d933338
commit bb039c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/dcicutils/ff_utils.py b/dcicutils/ff_utils.py
@@ -340,7 +340,6 @@ def get_es_metadata(uuid, es_client=None, key=None, ff_env=None):
     through the es_client param to save init time.
     Same auth mechanism as the other metadata functions
     """
-    from elasticsearch.exceptions import TransportError
     if es_client is None:
         # need to know ES server location and item type
         auth = get_authentication_with_server(key, ff_env)
@@ -356,7 +355,7 @@ def get_es_metadata(uuid, es_client=None, key=None, ff_env=None):
     elif len(es_hits) == 0:
         return {}
     # es_hits should only be length 1, so this is the result
-    return es_hits[0]
+    return es_hits[0]['_source']
 
 
 #####################

diff --git a/test/test_ff_utils.py b/test/test_ff_utils.py
@@ -353,5 +353,5 @@ def test_get_es_metadata(integrated_ff):
     assert res2['uuid'] == res['uuid']
 
     # bad item returns empty dict
-    res = ff_utils.get_es_metadata('blahblah', 'biosource', key=integrated_ff['ff_key'])
+    res = ff_utils.get_es_metadata('blahblah', key=integrated_ff['ff_key'])
     assert res == {}