Skip to content

Ved 1145 VED-1141 VED-1150 update test coverage#1359

Open
FimranNHS wants to merge 6 commits intomasterfrom
VED-1145-update-test-coverage
Open

Ved 1145 VED-1141 VED-1150 update test coverage#1359
FimranNHS wants to merge 6 commits intomasterfrom
VED-1145-update-test-coverage

Conversation

@FimranNHS
Copy link
Copy Markdown
Contributor

@FimranNHS FimranNHS commented Mar 30, 2026

Summary

  • Routine Change
  • ❗ Breaking Change
  • 🤖 Operational or Infrastructure Change
  • ✨ New Feature
  • ⚠️ Potential issues that might be caused by this change

Add any other relevant notes or explanations here. Remove this line if you have nothing to add.

Reviews Required

  • Dev
  • Test
  • Tech Author
  • Product Owner

Review Checklist

ℹ️ This section is to be filled in by the reviewer.

  • I have reviewed the changes in this PR and they fill all of the acceptance criteria of the ticket.
  • If there were infrastructure, operational, or build changes, I have made sure there is sufficient evidence that the changes will work.
  • If there were changes that are outside of the regular release processes e.g. account infrastructure to setup, manual setup for external API integrations, secrets to set, then I have checked that the developer has flagged this to the Tech Lead as release steps.
  • I have checked that no Personal Identifiable Data (PID) is logged as part of the changes.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Mar 30, 2026

This branch is working on a ticket in the NHS England VED JIRA Project. Here's a handy link to the ticket:

VED-1145

@FimranNHS FimranNHS changed the title Ved 1145 update test coverage Ved 1145 VED_1141 update test coverage Mar 30, 2026
@FimranNHS FimranNHS changed the title Ved 1145 VED_1141 update test coverage Ved 1145 VED-1141 update test coverage Mar 30, 2026
@FimranNHS FimranNHS changed the title Ved 1145 VED-1141 update test coverage Ved 1145 VED-1141 VED-1150 update test coverage Mar 30, 2026
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 08:32 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 08:49 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 08:51 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 09:08 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 09:12 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 09:28 — with GitHub Actions Failure
@Thomas-Boyle Thomas-Boyle added the bugfix This PR contains a fix for existing functionality. label Mar 30, 2026
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 09:52 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 12:31 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 12:38 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 12:55 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 13:29 — with GitHub Actions Error
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Mar 30, 2026

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 13:51 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 14:07 — with GitHub Actions Failure
@FimranNHS FimranNHS deployed to internal-qa March 30, 2026 14:35 — with GitHub Actions Active
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 15:09 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 15:10 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 15:26 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 15:31 — with GitHub Actions Failure
@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 15:48 — with GitHub Actions Failure
Thomas-Boyle
Thomas-Boyle reviewed Mar 30, 2026
View reviewed changes
tests/e2e_automation/utilities/batch_S3_buckets.py
Comment on lines 23 to +28
def wait_for_file_to_move_archive(context, timeout=120, interval=5):
s3 = boto3.client("s3")
bucket_scope = context.S3_env if context.S3_env != "preprod" else context.sub_environment
if context.S3_env == "preprod":
bucket_scope = "int-green"
else:
bucket_scope = context.S3_env
Copy link
Copy Markdown
Contributor

@Thomas-Boyle Thomas-Boyle Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hardcoded preprod archive bucket scope could break int-blue runs
In wait_for_file_to_move_archive, preprod now always maps to int-green, ignoring sub_environment. That changes prior behavior and can point checks at the wrong bucket for int-blue.

tests/e2e_automation/utilities/sqs_message_halder.py
Comment on lines +142 to +150
for msg in messages:
body = MnsEvent(**json.loads(msg["Body"]))
dataref = body.dataref

if dataref in expected_datarefs:
matched_messages.append(body)
print(f"Matched: {dataref}")

sqs.delete_message(QueueUrl=queue_url, ReceiptHandle=msg["ReceiptHandle"])
Copy link
Copy Markdown
Contributor

@Thomas-Boyle Thomas-Boyle Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Batch positive validation deletes all non-matching messages while polling. If an unexpected NullNHS message exists, it can be removed before the later “must not be created” assertion runs, producing a false pass.

@FimranNHS FimranNHS had a problem deploying to internal-dev-sandbox March 30, 2026 17:41 — with GitHub Actions Failure
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Thomas-Boyle Thomas-Boyle Thomas-Boyle left review comments

@davidmcgaw1 davidmcgaw1 Awaiting requested review from davidmcgaw1

@avshetty1980 avshetty1980 Awaiting requested review from avshetty1980

@krupasindhubaral krupasindhubaral Awaiting requested review from krupasindhubaral

At least 2 approving reviews are required to merge this pull request.

Assignees

No one assigned

Labels

bugfix This PR contains a fix for existing functionality.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@FimranNHS @Thomas-Boyle