@automattic/vip 4.1.4 → 4.1.6

package/packaging/windows/test-msi.ps1

@@ -1,225 +0,0 @@
-#Requires -Version 5.1
-[CmdletBinding()]
-param()
-
-$ErrorActionPreference = 'Stop'
-Set-StrictMode -Version Latest
-
-if ([Environment]::OSVersion.Platform -ne [PlatformID]::Win32NT) {
-  throw 'The MSI lifecycle test must run on a disposable Windows CI runner.'
-}
-if ($env:VIP_INSTALLER_E2E -ne '1' -or
-    $env:GITHUB_ACTIONS -notmatch '^(?i:true)$' -or
-    $env:RUNNER_ENVIRONMENT -notmatch '^(?i:github-hosted)$') {
-  throw 'Refusing to modify the host. This test requires VIP_INSTALLER_E2E=1 on a GitHub-hosted Actions runner.'
-}
-
-$identity = [Security.Principal.WindowsIdentity]::GetCurrent()
-$principal = New-Object Security.Principal.WindowsPrincipal($identity)
-if (-not $principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
-  throw 'The MSI lifecycle test requires an elevated disposable Windows CI runner.'
-}
-
-$repoRoot = [IO.Path]::GetFullPath((Join-Path $PSScriptRoot '..\..'))
-$buildScript = Join-Path $PSScriptRoot 'build-msi.ps1'
-$verifyScript = Join-Path $PSScriptRoot 'verify-msi.ps1'
-$installDir = Join-Path $env:ProgramFiles 'Automattic\VIP CLI'
-$markerPath = Join-Path $installDir '.vip-next-installer.json'
-$pathTarget = $installDir.TrimEnd('\')
-$initialMachinePath = [Environment]::GetEnvironmentVariable('Path', 'Machine')
-$tempRoot = Join-Path ([IO.Path]::GetTempPath()) ("vip-cli-msi-e2e-{0}" -f [Guid]::NewGuid().ToString('N'))
-$logsDir = Join-Path $tempRoot 'logs'
-$testInstalledProduct = $false
-
-function Test-PathContainsTarget([AllowNull()][string]$PathValue) {
-  if ($null -eq $PathValue) { return $false }
-  foreach ($entry in $PathValue.Split(';', [StringSplitOptions]::RemoveEmptyEntries)) {
-    if ([StringComparer]::OrdinalIgnoreCase.Equals($entry.Trim().TrimEnd('\'), $pathTarget)) {
-      return $true
-    }
-  }
-  return $false
-}
-
-function Get-VipCliUninstallEntries {
-  $roots = @(
-    'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\*',
-    'HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*'
-  )
-  return @(Get-ItemProperty -Path $roots -ErrorAction SilentlyContinue | Where-Object {
-    $displayName = $_.PSObject.Properties['DisplayName']
-    $installLocation = $_.PSObject.Properties['InstallLocation']
-    ($displayName -and $displayName.Value -eq 'VIP CLI') -or
-    ($installLocation -and $installLocation.Value -and
-      [StringComparer]::OrdinalIgnoreCase.Equals($installLocation.Value.TrimEnd('\'), $pathTarget))
-  })
-}
-
-function Invoke-MsiExec {
-  param(
-    [Parameter(Mandatory = $true)][ValidateSet('install', 'uninstall')][string]$Action,
-    [Parameter(Mandatory = $true)][string]$Target,
-    [Parameter(Mandatory = $true)][string]$Log,
-    [int[]]$ExpectedExitCodes = @(0)
-  )
-
-  $verb = if ($Action -eq 'install') { '/i' } else { '/x' }
-  $arguments = @($verb, "`"$Target`"", '/qn', '/norestart', '/l*v', "`"$Log`"")
-  $process = Start-Process -FilePath "$env:SystemRoot\System32\msiexec.exe" `
-    -ArgumentList $arguments `
-    -Wait -PassThru
-  if ($ExpectedExitCodes -notcontains $process.ExitCode) {
-    if (Test-Path -LiteralPath $Log) { Get-Content -LiteralPath $Log | Write-Host }
-    throw "msiexec $Action exited $($process.ExitCode); expected $($ExpectedExitCodes -join ', '). Log: $Log"
-  }
-  return $process.ExitCode
-}
-
-function New-FixtureExecutable {
-  param(
-    [Parameter(Mandatory = $true)][string]$Name,
-    [Parameter(Mandatory = $true)][string]$Version,
-    [Parameter(Mandatory = $true)][string]$Output
-  )
-
-  Push-Location $repoRoot
-  try {
-    $env:CGO_ENABLED = '0'
-    $env:GOOS = 'windows'
-    $env:GOARCH = 'amd64'
-    & go build -buildvcs=false -trimpath `
-      -ldflags "-s -w -X main.fixtureVersion=$Version" `
-      -o $Output ./testdata/installer-fixture
-    if ($LASTEXITCODE -ne 0) { throw "go build failed for $Name $Version" }
-  } finally {
-    Pop-Location
-  }
-}
-
-function Assert-InstalledPayload {
-  param(
-    [Parameter(Mandatory = $true)][string]$Version,
-    [Parameter(Mandatory = $true)][string]$ExpectedCli,
-    [Parameter(Mandatory = $true)][string]$ExpectedHelper
-  )
-
-  $installedCli = Join-Path $installDir 'vip-next.exe'
-  $installedHelper = Join-Path $installDir 'go-search-replace.exe'
-  foreach ($pair in @(@($installedCli, $ExpectedCli), @($installedHelper, $ExpectedHelper))) {
-    if (-not (Test-Path -LiteralPath $pair[0] -PathType Leaf)) { throw "Missing installed file: $($pair[0])" }
-    $actualHash = (Get-FileHash -LiteralPath $pair[0] -Algorithm SHA256).Hash
-    $expectedHash = (Get-FileHash -LiteralPath $pair[1] -Algorithm SHA256).Hash
-    if ($actualHash -ne $expectedHash) { throw "Installed bytes differ for $($pair[0])" }
-  }
-
-  $cliVersion = (& $installedCli --version | Out-String).Trim()
-  if ($LASTEXITCODE -ne 0 -or $cliVersion -ne $Version) {
-    throw "Unexpected vip-next version output: $cliVersion"
-  }
-  $helperVersion = (& $installedHelper --version | Out-String).Trim()
-  if ($LASTEXITCODE -ne 0 -or $helperVersion -ne "${Version}-helper") {
-    throw "Unexpected go-search-replace version output: $helperVersion"
-  }
-
-  if ((Get-Content -LiteralPath $markerPath -Raw) -ne '{"schema":1,"manager":"msi"}') {
-    throw 'Installer marker contents do not match the ownership contract.'
-  }
-  $installedLicense = Join-Path $installDir 'LICENSE.txt'
-  if (-not (Test-Path -LiteralPath $installedLicense -PathType Leaf) -or
-      (Get-FileHash -LiteralPath $installedLicense -Algorithm SHA256).Hash -ne
-      (Get-FileHash -LiteralPath (Join-Path $repoRoot 'LICENSE') -Algorithm SHA256).Hash) {
-    throw 'Installed license does not match the repository license.'
-  }
-  if (-not (Test-PathContainsTarget ([Environment]::GetEnvironmentVariable('Path', 'Machine')))) {
-    throw "The system PATH does not contain $installDir"
-  }
-  $owner = (& $installedCli --installer-owner | Out-String).Trim()
-  if ($LASTEXITCODE -ne 0 -or $owner -notmatch '(?i)\.msi') {
-    throw "Installed fixture did not report MSI ownership instructions: $owner"
-  }
-}
-
-if (Get-VipCliUninstallEntries) { throw 'Refusing to run with an existing VIP CLI MSI installation.' }
-if (Test-Path -LiteralPath $installDir) { throw "Refusing to run because $installDir already exists." }
-if (Test-Path -LiteralPath $markerPath) { throw "Refusing to run because $markerPath already exists." }
-if (Test-PathContainsTarget $initialMachinePath) { throw "Refusing to run because system PATH already contains $installDir." }
-if (-not (Get-Command go -ErrorAction SilentlyContinue)) { throw 'Go is required to build the lifecycle fixture executables.' }
-
-New-Item -ItemType Directory -Force -Path $logsDir | Out-Null
-
-try {
-  $versions = @('5.0.0-alpha.0', '5.0.0-alpha.1')
-  $artifacts = @{}
-  foreach ($version in $versions) {
-    $versionDir = Join-Path $tempRoot ($version -replace '[^A-Za-z0-9.-]', '-')
-    New-Item -ItemType Directory -Force -Path $versionDir | Out-Null
-    $cli = Join-Path $versionDir 'vip-next.exe'
-    $helper = Join-Path $versionDir 'go-search-replace.exe'
-    $msi = Join-Path $versionDir 'vip-next-windows-amd64.msi'
-    New-FixtureExecutable -Name 'vip-next' -Version $version -Output $cli
-    New-FixtureExecutable -Name 'go-search-replace' -Version "${version}-helper" -Output $helper
-    & $buildScript -Version $version -CLI $cli -Helper $helper -Output $msi
-    if ($LASTEXITCODE -ne 0) { throw "build-msi.ps1 failed for $version" }
-    & $verifyScript -MSI $msi -CLI $cli -Helper $helper
-    if ($LASTEXITCODE -ne 0) { throw "verify-msi.ps1 failed for $version" }
-    $artifacts[$version] = @{ CLI = $cli; Helper = $helper; MSI = $msi }
-  }
-
-  $alpha0 = $artifacts['5.0.0-alpha.0']
-  $alpha1 = $artifacts['5.0.0-alpha.1']
-  Invoke-MsiExec -Action install -Target $alpha0.MSI -Log (Join-Path $logsDir 'install-alpha.0.log')
-  $testInstalledProduct = $true
-  Assert-InstalledPayload -Version '5.0.0-alpha.0' -ExpectedCli $alpha0.CLI -ExpectedHelper $alpha0.Helper
-
-  Invoke-MsiExec -Action install -Target $alpha1.MSI -Log (Join-Path $logsDir 'upgrade-alpha.1.log')
-  Assert-InstalledPayload -Version '5.0.0-alpha.1' -ExpectedCli $alpha1.CLI -ExpectedHelper $alpha1.Helper
-
-  $downgradeExit = Invoke-MsiExec -Action install -Target $alpha0.MSI `
-    -Log (Join-Path $logsDir 'downgrade-alpha.0.log') -ExpectedExitCodes @(1603, 1638)
-  if ($downgradeExit -eq 0) { throw 'Downgrade unexpectedly succeeded.' }
-  Assert-InstalledPayload -Version '5.0.0-alpha.1' -ExpectedCli $alpha1.CLI -ExpectedHelper $alpha1.Helper
-
-  $entry = @(Get-VipCliUninstallEntries)
-  if ($entry.Count -ne 1 -or $entry[0].PSChildName -notmatch '^\{[0-9A-Fa-f-]{36}\}$') {
-    throw "Expected one uninstall registry entry, found $($entry.Count)."
-  }
-  Invoke-MsiExec -Action uninstall -Target $entry[0].PSChildName -Log (Join-Path $logsDir 'uninstall.log')
-  $testInstalledProduct = $false
-
-  foreach ($path in @(
-    (Join-Path $installDir 'vip-next.exe'),
-    (Join-Path $installDir 'go-search-replace.exe'),
-    (Join-Path $installDir 'LICENSE.txt'),
-    $markerPath
-  )) {
-    if (Test-Path -LiteralPath $path) { throw "Uninstall left managed file behind: $path" }
-  }
-  $finalMachinePath = [Environment]::GetEnvironmentVariable('Path', 'Machine')
-  if ($finalMachinePath -ne $initialMachinePath) {
-    throw 'Uninstall did not restore the exact initial system PATH.'
-  }
-  if (Get-VipCliUninstallEntries) { throw 'Uninstall registry entry remains after uninstall.' }
-} catch {
-  Get-ChildItem -LiteralPath $logsDir -Filter '*.log' -ErrorAction SilentlyContinue | ForEach-Object {
-    Write-Host "--- MSI log: $($_.FullName)"
-    Get-Content -LiteralPath $_.FullName | Write-Host
-  }
-  throw
-} finally {
-  if ($testInstalledProduct) {
-    $entries = @(Get-VipCliUninstallEntries)
-    foreach ($entry in $entries) {
-      if ($entry.PSChildName -match '^\{[0-9A-Fa-f-]{36}\}$') {
-        try {
-          Invoke-MsiExec -Action uninstall -Target $entry.PSChildName `
-            -Log (Join-Path $logsDir 'cleanup-uninstall.log') -ExpectedExitCodes @(0, 1605, 3010)
-        } catch {
-          Write-Warning "Cleanup uninstall failed: $_"
-        }
-      }
-    }
-  }
-  if (Test-Path -LiteralPath $tempRoot) {
-    Remove-Item -LiteralPath $tempRoot -Recurse -Force
-  }
-}

package/packaging/windows/verify-msi.ps1

@@ -1,74 +0,0 @@
-#Requires -Version 5.1
-[CmdletBinding()]
-param(
-  [Parameter(Mandatory = $true)][ValidateNotNullOrEmpty()][string]$MSI,
-  [Parameter(Mandatory = $true)][ValidateNotNullOrEmpty()][string]$CLI,
-  [Parameter(Mandatory = $true)][ValidateNotNullOrEmpty()][string]$Helper
-)
-
-$ErrorActionPreference = 'Stop'
-Set-StrictMode -Version Latest
-
-if ([Environment]::OSVersion.Platform -ne [PlatformID]::Win32NT) {
-  throw 'MSI payload verification requires Windows and msiexec.'
-}
-
-function Resolve-InputFile([string]$Path, [string]$Label) {
-  if (-not (Test-Path -LiteralPath $Path -PathType Leaf)) {
-    throw "$Label does not exist or is not a file: $Path"
-  }
-  return (Resolve-Path -LiteralPath $Path).ProviderPath
-}
-
-$repoRoot = [IO.Path]::GetFullPath((Join-Path $PSScriptRoot '..\..'))
-$msiPath = Resolve-InputFile $MSI 'MSI package'
-$cliPath = Resolve-InputFile $CLI 'CLI executable'
-$helperPath = Resolve-InputFile $Helper 'Helper executable'
-$licensePath = Resolve-InputFile (Join-Path $repoRoot 'LICENSE') 'Repository license'
-$initialMsiHash = (Get-FileHash -LiteralPath $msiPath -Algorithm SHA256).Hash
-$verifyRoot = Join-Path ([IO.Path]::GetTempPath()) ("vip-cli-msi-verify-{0}" -f [Guid]::NewGuid().ToString('N'))
-$extractRoot = Join-Path $verifyRoot 'image'
-$log = Join-Path $verifyRoot 'admin-extract.log'
-
-New-Item -ItemType Directory -Force -Path $extractRoot | Out-Null
-try {
-  $arguments = @('/a', "`"$msiPath`"", "TARGETDIR=`"$extractRoot`"", '/qn', '/l*v', "`"$log`"")
-  $process = Start-Process -FilePath "$env:SystemRoot\System32\msiexec.exe" `
-    -ArgumentList $arguments -Wait -PassThru
-  if ($process.ExitCode -ne 0) {
-    throw "MSI administrative extraction failed with exit $($process.ExitCode)"
-  }
-
-  $payloads = @(
-    @{ Name = 'vip-next.exe'; Expected = $cliPath },
-    @{ Name = 'go-search-replace.exe'; Expected = $helperPath },
-    @{ Name = 'LICENSE.txt'; Expected = $licensePath }
-  )
-  foreach ($payload in $payloads) {
-    $payloadFiles = @(Get-ChildItem -LiteralPath $extractRoot -Filter $payload.Name -File -Recurse)
-    if ($payloadFiles.Count -ne 1) {
-      throw "Expected one $($payload.Name) in MSI, found $($payloadFiles.Count)"
-    }
-    $actualHash = (Get-FileHash -LiteralPath $payloadFiles[0].FullName -Algorithm SHA256).Hash
-    $expectedHash = (Get-FileHash -LiteralPath $payload.Expected -Algorithm SHA256).Hash
-    if ($actualHash -ne $expectedHash) { throw "MSI payload bytes differ for $($payload.Name)" }
-  }
-
-  $markers = @(Get-ChildItem -LiteralPath $extractRoot -Filter '.vip-next-installer.json' -File -Recurse)
-  if ($markers.Count -ne 1 -or
-      (Get-Content -LiteralPath $markers[0].FullName -Raw) -ne '{"schema":1,"manager":"msi"}') {
-    throw 'MSI ownership marker is missing, duplicated, or invalid.'
-  }
-
-  $finalMsiHash = (Get-FileHash -LiteralPath $msiPath -Algorithm SHA256).Hash
-  if ($finalMsiHash -ne $initialMsiHash) {
-    throw 'MSI administrative extraction modified the source package.'
-  }
-} catch {
-  if (Test-Path -LiteralPath $log) { Get-Content -LiteralPath $log | Write-Host }
-  throw
-} finally {
-  if (Test-Path -LiteralPath $verifyRoot) {
-    Remove-Item -LiteralPath $verifyRoot -Recurse -Force
-  }
-}

package/packaging/windows/vip-next.wxs

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"
-     RequiredVersion="5.0.2">
-  <Package Name="VIP CLI"
-           Manufacturer="Automattic"
-           Version="$(NumericVersion)"
-           ProductCode="$(ProductCode)"
-           UpgradeCode="{9D089A27-73D9-4A31-91E1-A21A37ED94F1}"
-           Language="1033"
-           Scope="perMachine"
-           InstallerVersion="500"
-           Compressed="yes">
-    <SummaryInformation Description="WordPress VIP command-line interface"
-                        Manufacturer="Automattic" />
-    <MajorUpgrade AllowDowngrades="no"
-                  AllowSameVersionUpgrades="no"
-                  DowngradeErrorMessage="A newer version of VIP CLI is already installed."
-                  Schedule="afterInstallInitialize" />
-    <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
-
-    <StandardDirectory Id="ProgramFiles64Folder">
-      <Directory Id="AutomatticFolder" Name="Automattic">
-        <Directory Id="INSTALLFOLDER" Name="VIP CLI">
-          <Component Id="VipNextExecutable" Bitness="always64">
-            <File Id="VipNextExecutableFile"
-                  Name="vip-next.exe"
-                  Source="$(StageDir)\vip-next.exe"
-                  KeyPath="yes" />
-          </Component>
-          <Component Id="SearchReplaceExecutable" Bitness="always64">
-            <File Id="SearchReplaceExecutableFile"
-                  Name="go-search-replace.exe"
-                  Source="$(StageDir)\go-search-replace.exe"
-                  KeyPath="yes" />
-          </Component>
-          <Component Id="InstallerMarker" Bitness="always64">
-            <File Id="InstallerMarkerFile"
-                  Name=".vip-next-installer.json"
-                  Source="$(StageDir)\.vip-next-installer.json"
-                  KeyPath="yes" />
-          </Component>
-          <Component Id="LicenseFile" Bitness="always64">
-            <File Id="LicenseTextFile"
-                  Name="LICENSE.txt"
-                  Source="$(StageDir)\LICENSE.txt"
-                  KeyPath="yes" />
-          </Component>
-          <Component Id="SystemPathEntry" Bitness="always64">
-            <Environment Id="VipCliSystemPath"
-                         Name="PATH"
-                         Value="[INSTALLFOLDER]"
-                         Action="set"
-                         Part="last"
-                         System="yes"
-                         Permanent="no" />
-            <RegistryValue Root="HKLM"
-                           Key="Software\Automattic\VIP CLI"
-                           Name="InstallLocation"
-                           Type="string"
-                           Value="[INSTALLFOLDER]"
-                           KeyPath="yes" />
-          </Component>
-        </Directory>
-      </Directory>
-    </StandardDirectory>
-
-    <Feature Id="Complete" Title="VIP CLI" Level="1">
-      <ComponentRef Id="VipNextExecutable" />
-      <ComponentRef Id="SearchReplaceExecutable" />
-      <ComponentRef Id="InstallerMarker" />
-      <ComponentRef Id="LicenseFile" />
-      <ComponentRef Id="SystemPathEntry" />
-    </Feature>
-
-    <ui:WixUI Id="WixUI_Minimal" />
-    <WixVariable Id="WixUILicenseRtf" Value="$(LicenseRtf)" />
-  </Package>
-</Wix>

package/scripts/catalog_script_test.go

@@ -1,123 +0,0 @@
-// Package scripts_test exercises the repo's shell tooling.
-//
-// vip-next-command-catalog.sh is a cutover gate: it walks every vip-next
-// command and reports pass/fail. Its `run_expected_failure` helper documents
-// calls that MUST be rejected — most importantly `vip sync` targeting
-// production. A gate that cannot fail is not a gate, so these tests drive the
-// script from both sides: a stub CLI that rejects the call (the documented
-// behaviour) and a stub CLI that accepts it (the regression the gate exists to
-// catch).
-package scripts_test
-
-import (
-	"errors"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-// catalogStub writes a fake vip-next. In "reject-sync" mode it exits 1 for the
-// platform `sync` invocation (what the real CLI does today: production is not a
-// valid sync target); in "accept-everything" mode it exits 0 for every call,
-// simulating a future regression where vip-next starts ACCEPTING a sync into
-// production.
-func catalogStub(t *testing.T, mode string) string {
-	t.Helper()
-	dir := t.TempDir()
-	path := filepath.Join(dir, "vip-next-stub")
-
-	body := `#!/usr/bin/env bash
-# Fake vip-next for catalog-script tests.
-mode="` + mode + `"
-args="$*"
-if [[ "$mode" == "reject-sync" ]]; then
-	# The platform ` + "`sync`" + ` catalog entry is the only bare "sync" call;
-	# "dev-env sync --help" and "dev-env sync sql" must stay successful.
-	if [[ " $args " == *" sync "* || " $args " == *" sync" ]]; then
-		if [[ "$args" != *"--help"* && "$args" != *"dev-env"* ]]; then
-			echo "sync into production is not permitted" >&2
-			exit 1
-		fi
-	fi
-fi
-exit 0
-`
-	if err := os.WriteFile(path, []byte(body), 0o755); err != nil { // #nosec G306
-		t.Fatalf("write stub: %v", err)
-	}
-	return path
-}
-
-// runCatalog executes the catalog script with only the read-only and
-// expected-failure gates open. No mutating or destructive entry can run.
-func runCatalog(t *testing.T, stub string) (string, int) {
-	t.Helper()
-	cmd := exec.Command("bash", "./vip-next-command-catalog.sh")
-	cmd.Env = append(os.Environ(),
-		"VIP_NEXT="+stub,
-		"RUN=1",
-		"ALLOW_EXPECTED_FAILURES=1",
-		"ALLOW_INTERACTIVE=0",
-		"ALLOW_MUTATIONS=0",
-		"ALLOW_DESTRUCTIVE=0",
-	)
-	out, err := cmd.CombinedOutput()
-	code := 0
-	if err != nil {
-		var exitErr *exec.ExitError
-		if !errors.As(err, &exitErr) {
-			t.Fatalf("run catalog script: %v\n%s", err, out)
-		}
-		code = exitErr.ExitCode()
-	}
-	return string(out), code
-}
-
-func requireBash(t *testing.T) {
-	t.Helper()
-	if runtime.GOOS == "windows" {
-		t.Skip("catalog script is bash-only")
-	}
-	if _, err := exec.LookPath("bash"); err != nil {
-		t.Skip("bash not available")
-	}
-}
-
-// TestCatalogExpectedFailureAcceptsARejection is the documented happy path: the
-// CLI refuses the invalid call, the script records an expected failure, and the
-// suite still succeeds.
-func TestCatalogExpectedFailureAcceptsARejection(t *testing.T) {
-	requireBash(t)
-
-	out, code := runCatalog(t, catalogStub(t, "reject-sync"))
-
-	if code != 0 {
-		t.Fatalf("catalog exit = %d, want 0 when the expected failure actually failed\n%s", code, out)
-	}
-	if !strings.Contains(out, "expected-failures=1") {
-		t.Errorf("summary did not record the expected failure:\n%s", out)
-	}
-}
-
-// TestCatalogExpectedFailureFailsWhenTheCommandSucceeds is the reason this file
-// exists. `run_expected_failure` used to treat BOTH a zero and a non-zero exit
-// as success, so the gate would report PASS if vip-next started accepting a
-// sync into production. A zero exit MUST fail the suite.
-func TestCatalogExpectedFailureFailsWhenTheCommandSucceeds(t *testing.T) {
-	requireBash(t)
-
-	out, code := runCatalog(t, catalogStub(t, "accept-everything"))
-
-	if code == 0 {
-		t.Fatalf("catalog exit = 0; an expected-failure command that SUCCEEDED must fail the suite\n%s", out)
-	}
-	if !strings.Contains(out, "expected-failure command unexpectedly succeeded") {
-		t.Errorf("output does not explain why the suite failed:\n%s", out)
-	}
-	if !strings.Contains(out, "expected-failures=0") {
-		t.Errorf("a zero exit must not be counted as an expected failure:\n%s", out)
-	}
-}