Skip to content

Backport E2E test refactoring#14667

Merged
JamesNK merged 5 commits intorelease/13.2from
jamesnk/cli-e2e-refactor-backport
Feb 25, 2026
Merged

Backport E2E test refactoring#14667
JamesNK merged 5 commits intorelease/13.2from
jamesnk/cli-e2e-refactor-backport

Conversation

@JamesNK
Copy link
Member

@JamesNK JamesNK commented Feb 25, 2026

Backport changes from #14369. Prevent ongoing merge conflicts.

@JamesNK JamesNK requested a review from radical as a code owner February 25, 2026 00:59
@JamesNK JamesNK requested a review from eerhardt as a code owner February 25, 2026 00:59
Copilot AI review requested due to automatic review settings February 25, 2026 00:59
@github-actions
Copy link
Contributor

github-actions bot commented Feb 25, 2026

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 14667

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 14667"

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR backports E2E test refactoring changes from PR #14369 to centralize test terminal creation and helper methods, preventing merge conflicts with the main branch.

Changes:

  • Created a new shared Hex1bTestHelpers.cs file containing centralized terminal creation, SequenceCounter, and prompt-waiting extension methods
  • Refactored both CLI and Deployment E2E test projects to use the centralized helpers instead of duplicated code
  • Added global usings to make the shared namespace available across all test files

Reviewed changes

Copilot reviewed 52 out of 52 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
tests/Shared/Hex1bTestHelpers.cs New shared helper file containing SequenceCounter, CreateTestTerminal, and extension methods for waiting on terminal prompts
tests/Aspire.Deployment.EndToEnd.Tests/GlobalUsings.cs Added global using for Aspire.Tests.Shared namespace
tests/Aspire.Cli.EndToEnd.Tests/GlobalUsings.cs Added global using for Aspire.Tests.Shared namespace
tests/Aspire.Deployment.EndToEnd.Tests/Helpers/DeploymentE2ETestHelpers.cs Updated to delegate to shared helpers; removed duplicate extension methods
tests/Aspire.Cli.EndToEnd.Tests/Helpers/CliE2ETestHelpers.cs Updated to delegate to shared helpers; removed duplicate extension methods; minor comment improvements
tests/Aspire.Deployment.EndToEnd.Tests/Helpers/SequenceCounter.cs Deleted (moved to shared location)
tests/Aspire.Cli.EndToEnd.Tests/Helpers/SequenceCounter.cs Deleted (moved to shared location)
tests/Aspire.Deployment.EndToEnd.Tests/*.cs (21 test files) Updated to use DeploymentE2ETestHelpers.CreateTestTerminal() instead of manual terminal creation
tests/Aspire.Cli.EndToEnd.Tests/*.cs (18 test files) Updated to use CliE2ETestHelpers.CreateTestTerminal() instead of manual terminal creation
tests/Aspire.Deployment.EndToEnd.Tests/Aspire.Deployment.EndToEnd.Tests.csproj Added compile reference to shared Hex1bTestHelpers.cs
tests/Aspire.Cli.EndToEnd.Tests/Aspire.Cli.EndToEnd.Tests.csproj Added compile reference to shared Hex1bTestHelpers.cs
.github/skills/deployment-e2e-testing/SKILL.md Updated example to use new centralized helper method
.github/skills/cli-e2e-testing/SKILL.md Updated documentation to reflect new pattern; removed recordingPath example

@github-actions
Copy link
Contributor

github-actions bot commented Feb 25, 2026

🎬 CLI E2E Test Recordings

The following terminal recordings are available for commit 83e2669:

Test Recording
AddPackageInteractiveWhileAppHostRunningDetached ▶️ View Recording
AddPackageWhileAppHostRunningDetached ▶️ View Recording
AgentCommands_AllHelpOutputs_AreCorrect ▶️ View Recording
AgentInitCommand_MigratesDeprecatedConfig ▶️ View Recording
AgentInitCommand_WithMalformedMcpJson_ShowsErrorAndExitsNonZero ▶️ View Recording
AspireUpdateRemovesAppHostPackageVersionFromDirectoryPackagesProps ▶️ View Recording
Banner_DisplayedOnFirstRun ▶️ View Recording
Banner_DisplayedWithExplicitFlag ▶️ View Recording
CreateAndDeployToDockerCompose ▶️ View Recording
CreateAndDeployToDockerComposeInteractive ▶️ View Recording
CreateAndPublishToKubernetes ▶️ View Recording
CreateAndRunAspireStarterProject ▶️ View Recording
CreateAndRunAspireStarterProjectWithBundle ▶️ View Recording
CreateAndRunJsReactProject ▶️ View Recording
CreateAndRunPythonReactProject ▶️ View Recording
CreateEmptyAppHostProject ▶️ View Recording
CreateStartAndStopAspireProject ▶️ View Recording
CreateStartWaitAndStopAspireProject ▶️ View Recording
CreateTypeScriptAppHostWithViteApp ▶️ View Recording
DescribeCommandShowsRunningResources ▶️ View Recording
DetachFormatJsonProducesValidJson ▶️ View Recording
DoctorCommand_DetectsDeprecatedAgentConfig ▶️ View Recording
DoctorCommand_WithSslCertDir_ShowsTrusted ▶️ View Recording
DoctorCommand_WithoutSslCertDir_ShowsPartiallyTrusted ▶️ View Recording
LogsCommandShowsResourceLogs ▶️ View Recording
PsCommandListsRunningAppHost ▶️ View Recording
StagingChannel_ConfigureAndVerifySettings_ThenSwitchChannels ▶️ View Recording
StopAllAppHostsFromAppHostDirectory ▶️ View Recording
StopAllAppHostsFromUnrelatedDirectory ▶️ View Recording
StopNonInteractiveMultipleAppHostsShowsError ▶️ View Recording
StopNonInteractiveSingleAppHost ▶️ View Recording
StopWithNoRunningAppHostExitsSuccessfully ▶️ View Recording

📹 Recordings uploaded automatically from CI run #22380982080

@mitchdenny
Copy link
Member

/deployment-test

@github-actions
Copy link
Contributor

🚀 Deployment tests starting on PR #14667...

This will deploy to real Azure infrastructure. Results will be posted here when complete.

View workflow run

@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions github-actions bot temporarily deployed to deployment-testing February 25, 2026 05:20 Inactive
@github-actions
Copy link
Contributor

Deployment E2E Tests passed

Summary: 24 passed, 0 failed, 0 cancelled

View workflow run

Passed Tests

  • ✅ AcaCompactNamingDeploymentTests
  • ✅ AksStarterWithRedisDeploymentTests
  • ✅ AzureKeyVaultDeploymentTests
  • ✅ VnetKeyVaultInfraDeploymentTests
  • ✅ AcaStarterDeploymentTests
  • ✅ AzureAppConfigDeploymentTests
  • ✅ AppServicePythonDeploymentTests
  • ✅ AcaCustomRegistryDeploymentTests
  • ✅ AksStarterDeploymentTests
  • ✅ VnetStorageBlobInfraDeploymentTests
  • ✅ AzureContainerRegistryDeploymentTests
  • ✅ AzureStorageDeploymentTests
  • ✅ PythonFastApiDeploymentTests
  • ✅ AuthenticationTests
  • ✅ AzureLogAnalyticsDeploymentTests
  • ✅ AcaDeploymentErrorOutputTests
  • ✅ AzureEventHubsDeploymentTests
  • ✅ AcaCompactNamingUpgradeDeploymentTests
  • ✅ AcaExistingRegistryDeploymentTests
  • ✅ AppServiceReactDeploymentTests
  • ✅ VnetStorageBlobConnectivityDeploymentTests
  • ✅ AzureServiceBusDeploymentTests
  • ✅ VnetSqlServerInfraDeploymentTests
  • ✅ VnetKeyVaultConnectivityDeploymentTests

🎬 Terminal Recordings

Test Recording
DeployAzureAppConfigResourceCore ▶️ View Recording
DeployAzureContainerRegistryResourceCore ▶️ View Recording
DeployAzureEventHubsResourceCore ▶️ View Recording
DeployAzureKeyVaultResourceCore ▶️ View Recording
DeployAzureLogAnalyticsResourceCore ▶️ View Recording
DeployAzureServiceBusResourceCore ▶️ View Recording
DeployAzureStorageResourceCore ▶️ View Recording
DeployPythonFastApiTemplateToAzureAppServiceCore ▶️ View Recording
DeployPythonFastApiTemplateToAzureContainerAppsCore ▶️ View Recording
DeployReactTemplateToAzureAppServiceCore ▶️ View Recording
DeployStarterTemplateToAksCore ▶️ View Recording
DeployStarterTemplateToAzureContainerAppsCore ▶️ View Recording
DeployStarterTemplateWithCustomRegistryCore ▶️ View Recording
DeployStarterTemplateWithExistingRegistryCore ▶️ View Recording
DeployStarterTemplateWithKeyVaultPrivateEndpointCore ▶️ View Recording
DeployStarterTemplateWithRedisToAksCore ▶️ View Recording
DeployStarterTemplateWithStorageBlobPrivateEndpointCore ▶️ View Recording
DeployVnetKeyVaultInfrastructureCore ▶️ View Recording
DeployVnetSqlServerInfrastructureCore ▶️ View Recording
DeployVnetStorageBlobInfrastructureCore ▶️ View Recording
DeployWithCompactNamingFixesStorageCollisionCore ▶️ View Recording
DeployWithInvalidLocation_ErrorOutputIsCleanCore ▶️ View Recording
UpgradeFromGaToDevDoesNotDuplicateStorageAccountsCore ▶️ View Recording

@JamesNK JamesNK merged commit 29c11dd into release/13.2 Feb 25, 2026
704 of 708 checks passed
@JamesNK JamesNK deleted the jamesnk/cli-e2e-refactor-backport branch February 25, 2026 06:17
@dotnet-policy-service dotnet-policy-service bot added this to the 13.2 milestone Feb 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants