refactor doc_to_ds without adding dataset logic

integration_tests/conftest.py

@@ -252,6 +252,14 @@ def doc_to_ds(index, product_name, ds_doc, ds_path):
     return index.datasets.get(ds.id)
 
 
+def doc_to_ds_no_add(index, product_name, ds_doc, ds_path):
+    from datacube.index.hl import Doc2Dataset
+    resolver = Doc2Dataset(index, products=[product_name], verify_lineage=False)
+    ds, err = resolver(ds_doc, ds_path)
+    assert err is None and ds is not None
+    return ds
+
+
 @pytest.fixture
 def extended_eo3_metadata_type(index, extended_eo3_metadata_type_doc):
     return index.metadata_types.add(
@@ -341,46 +349,34 @@ def africa_eo3_dataset(index, africa_s2_eo3_product, eo3_africa_dataset_doc):
 
 @pytest.fixture
 def nrt_dataset(index, extended_eo3_metadata_type, ls8_eo3_product, nrt_dataset_doc):
-    ds_doc = nrt_dataset_doc[0]
-    ds_path = nrt_dataset_doc[1]
-    from datacube.index.hl import Doc2Dataset
-    resolver = Doc2Dataset(index, products=[ls8_eo3_product.name], verify_lineage=False)
-    ds, err = resolver(ds_doc, ds_path)
-    assert err is None and ds is not None
-    return ds
+    return doc_to_ds_no_add(
+        index,
+        ls8_eo3_product.name,
+        *nrt_dataset_doc)
 
 
 @pytest.fixture
 def final_dataset(index, extended_eo3_metadata_type, ls8_eo3_product, final_dataset_doc):
-    ds_doc = final_dataset_doc[0]
-    ds_path = final_dataset_doc[1]
-    from datacube.index.hl import Doc2Dataset
-    resolver = Doc2Dataset(index, products=[ls8_eo3_product.name], verify_lineage=False)
-    ds, err = resolver(ds_doc, ds_path)
-    assert err is None and ds is not None
-    return ds
+    return doc_to_ds_no_add(
+        index,
+        ls8_eo3_product.name,
+        *final_dataset_doc)
 
 
 @pytest.fixture
 def ga_s2am_ard3_final(index, eo3_sentinel_metadata_type, ga_s2am_ard_3_product, ga_s2am_ard_3_final_doc):
-    ds_doc = ga_s2am_ard_3_final_doc[0]
-    ds_path = ga_s2am_ard_3_final_doc[1]
-    from datacube.index.hl import Doc2Dataset
-    resolver = Doc2Dataset(index, products=[ga_s2am_ard_3_product.name], verify_lineage=False)
-    ds, err = resolver(ds_doc, ds_path)
-    assert err is None and ds is not None
-    return ds
+    return doc_to_ds_no_add(
+        index,
+        ga_s2am_ard_3_product.name,
+        *ga_s2am_ard_3_final_doc)
 
 
 @pytest.fixture
 def ga_s2am_ard3_interim(index, eo3_sentinel_metadata_type, ga_s2am_ard_3_product, ga_s2am_ard_3_interim_doc):
-    ds_doc = ga_s2am_ard_3_interim_doc[0]
-    ds_path = ga_s2am_ard_3_interim_doc[1]
-    from datacube.index.hl import Doc2Dataset
-    resolver = Doc2Dataset(index, products=[ga_s2am_ard_3_product.name], verify_lineage=False)
-    ds, err = resolver(ds_doc, ds_path)
-    assert err is None and ds is not None
-    return ds
+    return doc_to_ds_no_add(
+        index,
+        ga_s2am_ard_3_product.name,
+        *ga_s2am_ard_3_interim_doc)
 
 
 @pytest.fixture