File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 66import os
77import logging
88
9- logging .basicConfig (
10- format = "%(asctime)s %(levelname)-8s %(message)s" ,
11- level = logging .INFO ,
12- datefmt = "%Y-%m-%d %H:%M:%S" ,
13- )
149
1510logger = logging .getLogger ("sumo.wrapper" )
1611
@@ -31,7 +26,7 @@ def __init__(
3126 writeback = False ,
3227 verbosity = "CRITICAL" ,
3328 ):
34-
29+ logger . setLevel ( verbosity )
3530 logger .debug ("Initialize Auth" )
3631 self .client_id = client_id
3732 logger .debug ("client_id is %s" , self .client_id )
@@ -213,7 +208,6 @@ def _read_cache(self):
213208 self .cache .deserialize (file .read ())
214209
215210 def _get_cache (self ):
216-
217211 logger .debug ("_get_cache" )
218212 self .cache = msal .SerializableTokenCache ()
219213
Original file line number Diff line number Diff line change @@ -41,7 +41,6 @@ def __init__(
4141 writeback = False ,
4242 verbosity = "CRITICAL" ,
4343 ):
44-
4544 logger .setLevel (level = verbosity )
4645
4746 self .resource_id = resource_id
Original file line number Diff line number Diff line change @@ -378,7 +378,6 @@ def _post_objects(
378378 """
379379
380380 if not url :
381-
382381 url = f"{ self .base_url } /objects"
383382
384383 if object_id :
Original file line number Diff line number Diff line change @@ -154,7 +154,7 @@ def test_upload_search_delete_ensemble_child(token):
154154 result = _delete_object (C = C , object_id = case_id )
155155 assert result == "Accepted"
156156
157- sleep (4 )
157+ sleep (40 )
158158
159159 # Search for ensemble
160160 search_results = C .api .get ("/searchroot" , query = query , select = ["_source" ])
@@ -189,6 +189,11 @@ def test_upload_duplicate_ensemble(token):
189189
190190 with open ("tests/testdata/case.yml" , "r" ) as stream :
191191 fmu_metadata2 = yaml .safe_load (stream )
192+
193+ case_uuid = str (uuid .uuid4 ())
194+ fmu_metadata1 ["fmu" ]["case" ]["uuid" ] = case_uuid
195+ fmu_metadata2 ["fmu" ]["case" ]["uuid" ] = case_uuid
196+
192197
193198 # upload case metadata, get object_id
194199 response1 = _upload_parent_object (C = C , json = fmu_metadata1 )
@@ -206,10 +211,11 @@ def test_upload_duplicate_ensemble(token):
206211 assert get_result ["_id" ] == case_id1
207212
208213 # Delete Ensemble
214+ sleep (5 )
209215 result = _delete_object (C = C , object_id = case_id1 )
210216 assert result == "Accepted"
211217
212- sleep (5 )
218+ sleep (50 )
213219
214220 # Search for ensemble
215221 with pytest .raises (Exception ):
Original file line number Diff line number Diff line change @@ -133,9 +133,11 @@ data: # The data block describes the actual data (e.g. surface). Only present in
133133 zmin : 1244.039
134134 zmax : 2302.683
135135 time :
136- - value : ' 2020-10-28T14:28:02'
136+ t0 :
137+ value : ' 2020-10-28T14:28:02'
137138 label : " some label"
138- - value : ' 2020-10-28T14:28:02'
139+ t1 :
140+ value : ' 2020-10-28T14:33:02'
139141 label : " some other label"
140142 is_prediction : true # A mechanism for separating pure QC output from actual predictions
141143 is_observation : true # Used for 4D data currently but also valid for other data?
You can’t perform that action at this time.
0 commit comments