Merge pull request #106 from equinor/testing-parameters

Testing parameters

Author: adnejacobsen

conftest.py

@@ -0,0 +1,9 @@
+def pytest_addoption(parser):
+    parser.addoption("--token", action="store", default="")
+
+def pytest_generate_tests(metafunc):
+    token = metafunc.config.option.token
+    token = token if len(token) > 0 else None
+
+    if "token" in metafunc.fixturenames:
+        metafunc.parametrize("token", [token])

requirements.txt

@@ -3,3 +3,4 @@ requests~=2.24.0
 pytest~=6.1.1
 PyYAML>=5.4
 setuptools~=49.2.1
+pyjwt>=2.4.0

src/sumo/wrapper/_request_error.py

@@ -39,7 +39,7 @@ def __init__(self, code, message):
     def __str__(self):
         return (
             f"Fatal Request Error with status code {self.code} "
-            "and text {self.message}."
+            f"and text {self.message}."
         )
 
 

tests/test_sumo_thin_client.py

@@ -12,8 +12,8 @@
 
 
 class Connection:
-    def __init__(self):
-        self.api = SumoClient(env="dev")
+    def __init__(self, token):
+        self.api = SumoClient(env="dev", token=token)
 
 
 def _upload_parent_object(C, json):
@@ -25,7 +25,7 @@ def _upload_parent_object(C, json):
 
 
 def _upload_blob(C, blob, url=None, object_id=None):
-    response = C.api.put(f"/objects('{object_id}')/blob", blob=blob)
+    response = C.api.blob_client.upload_blob(blob=blob, url=url)
 
     print("Blob save " + str(response.status_code), flush=True)
     if not 200 <= response.status_code < 202:
@@ -76,15 +76,15 @@ class ValueKeeper:
 """ TESTS """
 
 
-def test_upload_search_delete_ensemble_child():
+def test_upload_search_delete_ensemble_child(token):
     """
     Testing the wrapper functionalities.
 
     We upload an ensemble object along with a child. After that, we search for
     those objects to make sure they are available to the user. We then delete
     them and repeat the search to check if they were properly removed from sumo.
     """
-    C = Connection()
+    C = Connection(token)
     B = b"123456789"
 
     # Upload Ensemble
@@ -113,9 +113,10 @@ def test_upload_search_delete_ensemble_child():
     assert isinstance(response_surface.json(), dict)
 
     surface_id = response_surface.json().get("objectid")
+    blob_url = response_surface.json().get("blob_url")
 
     # Upload BLOB
-    response_blob = _upload_blob(C=C, blob=B, object_id=surface_id)
+    response_blob = _upload_blob(C=C, blob=B, url=blob_url, object_id=surface_id)
     assert 200 <= response_blob.status_code <= 202
 
     sleep(4)
@@ -161,20 +162,20 @@ def test_upload_search_delete_ensemble_child():
     assert total == 0
 
 
-def test_fail_on_wrong_metadata():
+def test_fail_on_wrong_metadata(token):
     """
     Upload a parent object with erroneous metadata, confirm failure
     """
-    C = Connection()
+    C = Connection(token)
     with pytest.raises(Exception):
         assert _upload_parent_object(C=C, json={"some field": "some value"})
 
 
-def test_upload_duplicate_ensemble():
+def test_upload_duplicate_ensemble(token):
     """
     Adding a duplicate ensemble, both tries must return same id.
     """
-    C = Connection()
+    C = Connection(token)
 
     with open("tests/testdata/case.yml", "r") as stream:
         fmu_metadata1 = yaml.safe_load(stream)