updated scenario name

DFE-Digital · Jun 3, 2024 · ac4a66b · ac4a66b
1 parent ceaf834
commit ac4a66b
Show file tree

Hide file tree

Showing 24 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -424,3 +424,4 @@ local.settings.json
 front-end-components/vite.config-dev.js.timestamp-*
 documentation/build
 documentation/**/work
+data-pipeline/tests/e2e/.env.local
diff --git a/data-pipeline/tests/e2e/.env.local b/data-pipeline/tests/e2e/.env.local
@@ -1,4 +1,10 @@
 STORAGE_CONNECTION_STRING=DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;
 WORKER_QUEUE_NAME=data-pipeline-job-start
 COMPLETE_QUEUE_NAME=data-pipeline-job-finished
-RAW_DATA_CONTAINER=raw
+RAW_DATA_CONTAINER=raw
+DB_NAME=data
+DB_PORT=1433
+DB_ARGS=Encrypt=no;TrustServerCertificate=no;Connection Timeout=30
+DB_HOST=mssql
+DB_USER=sa
+DB_PWD=mystrong!Pa55word
diff --git a/...cenarios/scenario2/expected/academies.csv → ...ingleAcademyTrusts/expected/academies.csv b/...cenarios/scenario2/expected/academies.csv → ...ingleAcademyTrusts/expected/academies.csv
diff --git a/...enarios/scenario2/expected/academy_ar.csv → ...ngleAcademyTrusts/expected/academy_ar.csv b/...enarios/scenario2/expected/academy_ar.csv → ...ngleAcademyTrusts/expected/academy_ar.csv
diff --git a/.../e2e/scenarios/scenario2/expected/cdc.csv → ...adingSingleAcademyTrusts/expected/cdc.csv b/.../e2e/scenarios/scenario2/expected/cdc.csv → ...adingSingleAcademyTrusts/expected/cdc.csv
diff --git a/...e/scenarios/scenario2/expected/census.csv → ...ngSingleAcademyTrusts/expected/census.csv b/...e/scenarios/scenario2/expected/census.csv → ...ngSingleAcademyTrusts/expected/census.csv
diff --git a/.../e2e/scenarios/scenario2/expected/ks2.csv → ...adingSingleAcademyTrusts/expected/ks2.csv b/.../e2e/scenarios/scenario2/expected/ks2.csv → ...adingSingleAcademyTrusts/expected/ks2.csv
diff --git a/.../e2e/scenarios/scenario2/expected/ks4.csv → ...adingSingleAcademyTrusts/expected/ks4.csv b/.../e2e/scenarios/scenario2/expected/ks4.csv → ...adingSingleAcademyTrusts/expected/ks4.csv
diff --git a/.../scenarios/scenario2/expected/schools.csv → ...gSingleAcademyTrusts/expected/schools.csv b/.../scenarios/scenario2/expected/schools.csv → ...gSingleAcademyTrusts/expected/schools.csv
diff --git a/.../e2e/scenarios/scenario2/expected/sen.csv → ...adingSingleAcademyTrusts/expected/sen.csv b/.../e2e/scenarios/scenario2/expected/sen.csv → ...adingSingleAcademyTrusts/expected/sen.csv
diff --git a/...scenarios/scenario2/expected/trust_ar.csv → ...SingleAcademyTrusts/expected/trust_ar.csv b/...scenarios/scenario2/expected/trust_ar.csv → ...SingleAcademyTrusts/expected/trust_ar.csv
diff --git a/...e/scenarios/scenario2/raw/academy_ar.xlsx → ...ngSingleAcademyTrusts/raw/academy_ar.xlsx b/...e/scenarios/scenario2/raw/academy_ar.xlsx → ...ngSingleAcademyTrusts/raw/academy_ar.xlsx
diff --git a/...os/scenario2/raw/academy_master_list.xlsx → ...cademyTrusts/raw/academy_master_list.xlsx b/...os/scenario2/raw/academy_master_list.xlsx → ...cademyTrusts/raw/academy_master_list.xlsx
diff --git a/...tests/e2e/scenarios/scenario2/raw/cdc.csv → ...henLoadingSingleAcademyTrusts/raw/cdc.csv b/...tests/e2e/scenarios/scenario2/raw/cdc.csv → ...henLoadingSingleAcademyTrusts/raw/cdc.csv
diff --git a/...scenarios/scenario2/raw/census_pupils.csv → ...SingleAcademyTrusts/raw/census_pupils.csv b/...scenarios/scenario2/raw/census_pupils.csv → ...SingleAcademyTrusts/raw/census_pupils.csv
diff --git a/...arios/scenario2/raw/census_workforce.xlsx → ...leAcademyTrusts/raw/census_workforce.xlsx b/...arios/scenario2/raw/census_workforce.xlsx → ...leAcademyTrusts/raw/census_workforce.xlsx
diff --git a/...ests/e2e/scenarios/scenario2/raw/gias.csv → ...enLoadingSingleAcademyTrusts/raw/gias.csv b/...ests/e2e/scenarios/scenario2/raw/gias.csv → ...enLoadingSingleAcademyTrusts/raw/gias.csv
diff --git a/...cenarios/scenario2/raw/gias_all_links.csv → ...ingleAcademyTrusts/raw/gias_all_links.csv b/...cenarios/scenario2/raw/gias_all_links.csv → ...ingleAcademyTrusts/raw/gias_all_links.csv
diff --git a/...2e/scenarios/scenario2/raw/gias_links.csv → ...ingSingleAcademyTrusts/raw/gias_links.csv b/...2e/scenarios/scenario2/raw/gias_links.csv → ...ingSingleAcademyTrusts/raw/gias_links.csv
diff --git a/...ests/e2e/scenarios/scenario2/raw/ks2.xlsx → ...enLoadingSingleAcademyTrusts/raw/ks2.xlsx b/...ests/e2e/scenarios/scenario2/raw/ks2.xlsx → ...enLoadingSingleAcademyTrusts/raw/ks2.xlsx
diff --git a/...ests/e2e/scenarios/scenario2/raw/ks4.xlsx → ...enLoadingSingleAcademyTrusts/raw/ks4.xlsx b/...ests/e2e/scenarios/scenario2/raw/ks4.xlsx → ...enLoadingSingleAcademyTrusts/raw/ks4.xlsx
diff --git a/...o2/raw/maintained_schools_master_list.csv → ...ts/raw/maintained_schools_master_list.csv b/...o2/raw/maintained_schools_master_list.csv → ...ts/raw/maintained_schools_master_list.csv
diff --git a/...tests/e2e/scenarios/scenario2/raw/sen.csv → ...henLoadingSingleAcademyTrusts/raw/sen.csv b/...tests/e2e/scenarios/scenario2/raw/sen.csv → ...henLoadingSingleAcademyTrusts/raw/sen.csv
diff --git a/data-pipeline/tests/e2e/synthetic_data_test.py b/data-pipeline/tests/e2e/synthetic_data_test.py
@@ -101,7 +101,7 @@ def test_synthetic_data_env_is_set():
 
 # To add a new scenario just add a folder with the name of the scenario
 # and add the scenario to the list below.
-@pytest.mark.parametrize("scenario_name", ["scenario1"])
+@pytest.mark.parametrize("scenario_name", ["WhenLoadingSingleAcademyTrusts"])
 def test_run_scenarios(scenario_name):
     copy_raw_files_to_raw_blob_storage(scenario_name)
     trigger_pipeline(scenario_name)