fix and rename tests

Author: abradley60

pixi.lock

@@ -100,7 +100,9 @@ test-scene-data-source-queries="pixi run install-pygssearch-env && export PYGSSE
 # Tests require credentials - not currently setup for github but should be run locally before PRs
 test-isce3-rtc = "pytest tests/sar_pipeline/isce3_rtc -o log_cli=true --capture=tee-sys --log-cli-level=INFO -v -s"
 test-isce3-rtc-full-docker-run = "pytest tests/sar_pipeline/isce3_rtc/test_full_docker_build_and_run.py -o log_cli=true --capture=tee-sys --log-cli-level=INFO -v -s"
+test-isce3-burst-utils = "pytest tests/sar_pipeline/isce3_rtc/test_burst_utils.py -o log_cli=true --capture=tee-sys --log-cli-level=INFO -v -s"
 test-isce3-rtc-cli-make-rtc-opera-stac-and-upload-bursts = "pytest tests/sar_pipeline/isce3_rtc/test_cli_make_rtc_opera_stac_and_upload_bursts.py -o log_cli=true --capture=tee-sys --log-cli-level=INFO -v -s"
+test-isce3-rtc-cli-get-data-for-scene-and-make-run-config= "pytest tests/sar_pipeline/isce3_rtc/test_cli_get_data_for_scene_and_make_run_config.py -o log_cli=true --capture=tee-sys --log-cli-level=INFO -v -s"
 test-isce3-rtc-downloads= "pixi run install-pygssearch-env && export PYGSSEARCH_CONDA_ENV='$(conda info --base)/envs/pygssearch-env' && pytest tests/sar_pipeline/isce3_rtc/test_downloads.py -o log_cli=true --capture=tee-sys --log-cli-level=INFO -v -s"
 
 ### NCI Pipeline Tests ###

pyproject.toml

@@ -1157,7 +1157,7 @@ def compare_products(
             tifs_are_same, stats = compare_cog_stats(tif_1, tif_2)
             tif_comparison_stats[filetype] = stats
         else:
-            tif_2 = [x for x in tif_files_2 if filetype in x]
+            tif_2 = [x for x in tif_files_2 if str(filetype) in str(x)]
             if not tif_2:
                 logger.warning(
                     f'Could not find tif of same filetype "{filetype}" to compare with {tif_1}'

sar_pipeline/pipelines/isce3_rtc/cli.py

@@ -37,6 +37,7 @@
 
 @dataclass
 class RunConfig:
+    scene: str
     test_product_s3_bucket: Path
     test_product_s3_folder: Path
     original_local_product_folder: Path
@@ -59,6 +60,7 @@ class RunConfig:
 from settings import (
     CURRENT_DIR,
     TEST_S3_BUCKET,
+    TEST_1_SCENE,
     TEST_1_COLLECTION_NUMBER,
     TEST_1_BURST,
     TEST_1_COMPARE_RTC_S1_S3_PROJECT_FOLDER,
@@ -79,6 +81,7 @@ class RunConfig:
 # PERSISTENT_S3_PROJECT_FOLDER = "experimental/baseline/antarctica"
 
 TEST_1 = RunConfig(
+    scene=TEST_1_SCENE,
     test_product_s3_bucket=TEST_S3_BUCKET,
     test_product_s3_folder=TEST_1_COMPARE_RTC_S1_S3_PROJECT_FOLDER,
     original_local_product_folder=f"{ORIGINAL_PRODUCT_RESULTS_DIR}/TEST_1/RTC_S1/{TEST_1_BURST}",
@@ -134,6 +137,7 @@ def test_cli_make_rtc_opera_stac_and_upload_bursts(test_run):
 
     runner = CliRunner()
     args = ["--results-folder", results_folder]
+    args += ["--scene", test_run.scene]
     args += ["--run-config-path", run_config]
     args += ["--product", test_run.product]
     args += ["--backscatter-convention", test_run.backscatter_convention]
@@ -143,18 +147,6 @@ def test_cli_make_rtc_opera_stac_and_upload_bursts(test_run):
     args += ["--skip-upload-to-s3"] if test_run.skip_upload_to_s3 else []
     args += ["--make-existing-products"] if test_run.make_existing_products else []
     args += ["--link-static-layers"] if test_run.link_static_layers else []
-    args += [
-        "--linked-static-layers-s3-bucket",
-        test_run.linked_static_layers_s3_bucket,
-    ]
-    args += [
-        "--linked-static-layers-collection-number",
-        test_run.linked_static_layers_collection_number,
-    ]
-    args += [
-        "--linked-static-layers-s3-project-folder",
-        test_run.linked_static_layers_s3_project_folder,
-    ]
     args += ["--validate-stac"] if test_run.validate_stac else []
 
     logging.info(f"Running make_rtc_opera_stac_and_upload_bursts.")