Stabilize headless CLI CI fixtures

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: mamoreau-devolutions

testing/automation/cli-e2e.manifest.windows.json

@@ -29,17 +29,6 @@
         "repair"
       ]
     },
-    {
-      "manager": "Pip",
-      "sourceName": "pip",
-      "query": "cowsay",
-      "packageId": "cowsay",
-      "installVersion": "5.0",
-      "scope": "User",
-      "roles": [
-        "specific-update"
-      ]
-    },
     {
       "manager": "Npm",
       "sourceName": "npm",
@@ -48,20 +37,14 @@
       "installVersion": "1.5.0",
       "scope": "Global",
       "roles": [
+        "specific-update",
         "toggle-manager",
         "update-all",
         "update-discovery"
       ]
     }
   ],
   "queueOperations": [
-    {
-      "manager": "Pip",
-      "sourceName": "pip",
-      "packageId": "awscli",
-      "target": "download",
-      "query": "awscli"
-    },
     {
       "manager": "Npm",
       "sourceName": "npm",

testing/automation/run-cli-e2e.ps1

@@ -935,18 +935,25 @@ try {
     Add-Tested 'operation forget'
 
     Write-Stage 'Package lifecycle and updates'
-    $pipFixture = @($manifest.packageManagers | Where-Object { $_.manager -eq 'Pip' })[0]
-    $npmFixture = @($manifest.packageManagers | Where-Object { $_.manager -eq 'Npm' })[0]
-    $pipLatestVersion = [string]$fixtureState[$pipFixture.manager].latestVersion
-    $npmLatestVersion = [string]$fixtureState[$npmFixture.manager].latestVersion
-    $dotnetLatestVersion = [string]$fixtureState[$bundleFixture.manager].latestVersion
-
-    $pipInstall = Invoke-CliJson -Arguments (@('package', 'install') + (Get-PackageArguments -Fixture $pipFixture -IncludeVersion -IncludeSource))
-    Assert-JsonCommandSucceeded -Response $pipInstall -Label 'package install Pip'
-    $npmInstall = Invoke-CliJson -Arguments (@('package', 'install') + (Get-PackageArguments -Fixture $npmFixture -IncludeVersion -IncludeSource))
-    Assert-JsonCommandSucceeded -Response $npmInstall -Label 'package install Npm'
-    Wait-ForInstalledPackage -Fixture $pipFixture -ExpectedVersion $pipFixture.installVersion | Out-Null
-    Wait-ForInstalledPackage -Fixture $npmFixture -ExpectedVersion $npmFixture.installVersion | Out-Null
+    $specificUpdateFixture = @($manifest.packageManagers | Where-Object { @($_.roles) -contains 'specific-update' })[0]
+    if ($null -eq $specificUpdateFixture) {
+        throw 'The CLI E2E manifest must define a package manager fixture with the specific-update role.'
+    }
+    $directInstallFixtures = @($manifest.packageManagers | Where-Object {
+            $null -ne $specificUpdateFixture -and [string]$_.manager -eq [string]$specificUpdateFixture.manager
+        })
+    $otherInstallFixtures = @($manifest.packageManagers | Where-Object {
+            [string]$_.manager -ne [string]$bundleFixture.manager -and
+            [string]$_.manager -ne [string]$specificUpdateFixture.manager
+        })
+    $directInstallFixtures += $otherInstallFixtures
+    $bundleLatestVersion = [string]$fixtureState[$bundleFixture.manager].latestVersion
+
+    foreach ($installFixture in $directInstallFixtures) {
+        $installResult = Invoke-CliJson -Arguments (@('package', 'install') + (Get-PackageArguments -Fixture $installFixture -IncludeVersion -IncludeSource))
+        Assert-JsonCommandSucceeded -Response $installResult -Label "package install $($installFixture.manager)"
+        Wait-ForInstalledPackage -Fixture $installFixture -ExpectedVersion $installFixture.installVersion | Out-Null
+    }
     Add-Tested 'package install'
     Add-Tested 'package installed'
 
@@ -980,11 +987,11 @@ try {
 
     $specificUpdate = Invoke-CliJson -Arguments (@(
             'package', 'update'
-        ) + (Get-PackageArguments -Fixture $pipFixture -IncludeSource) + @(
-            '--version', $pipLatestVersion
+        ) + (Get-PackageArguments -Fixture $specificUpdateFixture -IncludeSource) + @(
+            '--version', [string]$fixtureState[$specificUpdateFixture.manager].latestVersion
         ))
-    Assert-JsonCommandSucceeded -Response $specificUpdate -Label 'package update Pip'
-    Wait-ForInstalledPackage -Fixture $pipFixture -ExpectedVersion $pipLatestVersion | Out-Null
+    Assert-JsonCommandSucceeded -Response $specificUpdate -Label "package update $($specificUpdateFixture.manager)"
+    Wait-ForInstalledPackage -Fixture $specificUpdateFixture -ExpectedVersion ([string]$fixtureState[$specificUpdateFixture.manager].latestVersion) | Out-Null
     Add-Tested 'package update'
 
     $updateManager = Invoke-CliFailure -Arguments @('package', 'update-manager', '--manager', [string]$bundleFixture.manager)
@@ -1001,12 +1008,12 @@ try {
 
     $reinstall = Invoke-CliJson -Arguments (@('package', 'reinstall') + (Get-PackageArguments -Fixture $bundleFixture -IncludeSource))
     Assert-JsonCommandSucceeded -Response $reinstall -Label 'package reinstall'
-    Wait-ForInstalledPackage -Fixture $bundleFixture -ExpectedVersion $dotnetLatestVersion | Out-Null
+    Wait-ForInstalledPackage -Fixture $bundleFixture -ExpectedVersion $bundleLatestVersion | Out-Null
     Add-Tested 'package reinstall'
 
     $repair = Invoke-CliJson -Arguments (@('package', 'repair') + (Get-PackageArguments -Fixture $bundleFixture -IncludeSource))
     Assert-JsonCommandSucceeded -Response $repair -Label 'package repair'
-    Wait-ForInstalledPackage -Fixture $bundleFixture -ExpectedVersion $dotnetLatestVersion | Out-Null
+    Wait-ForInstalledPackage -Fixture $bundleFixture -ExpectedVersion $bundleLatestVersion | Out-Null
     Add-Tested 'package repair'
 
     $installedAll = Invoke-CliJson -Arguments @('package', 'installed')
@@ -1040,19 +1047,19 @@ try {
     Add-Tested 'log manager'
 
     Write-Stage 'Package uninstall'
-    [string[]]$uninstallValidationManagerNames = @(
-        if ($null -ne $manifest.PSObject.Properties['uninstallValidationManagers']) {
-            $manifest.uninstallValidationManagers | ForEach-Object { [string]$_ }
+    $uninstallValidationFixtures = @($manifest.packageManagers)
+    if ($null -ne $manifest.PSObject.Properties['uninstallValidationManagers']) {
+        $uninstallValidationManagerNames = [System.Collections.Generic.HashSet[string]]::new([System.StringComparer]::OrdinalIgnoreCase)
+        foreach ($managerName in @($manifest.uninstallValidationManagers)) {
+            if (-not [string]::IsNullOrWhiteSpace([string]$managerName)) {
+                [void]$uninstallValidationManagerNames.Add([string]$managerName)
+            }
         }
-    )
-    $uninstallValidationFixtures = if ($uninstallValidationManagerNames.Count -gt 0) {
-        @($manifest.packageManagers | Where-Object {
-                $uninstallValidationManagerNames -contains [string]$_.manager
+
+        $uninstallValidationFixtures = @($manifest.packageManagers | Where-Object {
+                $uninstallValidationManagerNames.Contains([string]$_.manager)
             })
     }
-    else {
-        @($manifest.packageManagers)
-    }
     foreach ($fixture in $uninstallValidationFixtures) {
         $uninstall = Invoke-CliJson -Arguments (@('package', 'uninstall') + (Get-PackageArguments -Fixture $fixture -IncludeSource))
         Assert-JsonCommandSucceeded -Response $uninstall -Label "package uninstall $($fixture.packageId)"