Fixing syntax errors

Author: ycombinator

testing/integration/upgrade_fleet_test.go

@@ -110,7 +110,7 @@ func testFleetManagedUpgrade(t *testing.T, info *define.Info, unprivileged bool,
 
 	// Start at the build version as we want to test the retry
 	// logic that is in the build.
-	var startFixture *testing.Fixture
+	var startFixture *atesting.Fixture
 	var err error
 	if fips {
 		startFixture, err = define.NewFixtureFromLocalFIPSBuild(t, define.Version())
@@ -521,10 +521,9 @@ func testUpgradeFleetManagedElasticAgent(
 	err = upgradetest.CheckHealthyAndVersion(ctx, startFixture, endVersionInfo.Binary)
 	assert.NoError(t, err)
 
-	if upgradeOpts.postWatcherSuccessHook != nil {
-		if err := upgradeOpts.postWatcherSuccessHook(ctx, endFixture); err != nil {
-			return fmt.Errorf("post watcher success hook failed: %w", err)
-		}
+	if upgradeOpts.PostWatcherSuccessHook != nil {
+		err = upgradeOpts.PostWatcherSuccessHook(ctx, endFixture)
+		require.NoError(t, err)
 	}
 }
 

testing/integration/upgrade_standalone_fips_test.go

@@ -81,12 +81,12 @@ func TestStandaloneUpgradeFIPStoFIPS(t *testing.T) {
 		}
 		t.Run(fmt.Sprintf("Upgrade %s to %s (privileged)", startVersion, define.Version()), func(t *testing.T) {
 			upgradeOpts = append(upgradeOpts, upgradetest.WithUnprivileged(false))
-			testStandaloneUpgradeSucceeded(t, startVersion, define.Version(), fipsArtifactFetcher, upgradeOpts...)
+			testStandaloneUpgrade(t, startVersion, define.Version(), fipsArtifactFetcher, upgradeOpts...)
 		})
 		if unprivilegedAvailable {
 			upgradeOpts = append(upgradeOpts, upgradetest.WithUnprivileged(true))
 			t.Run(fmt.Sprintf("Upgrade %s to %s (unprivileged)", startVersion, define.Version()), func(t *testing.T) {
-				testStandaloneUpgradeSucceeded(t, startVersion, define.Version(), fipsArtifactFetcher, upgradeOpts...)
+				testStandaloneUpgrade(t, startVersion, define.Version(), fipsArtifactFetcher, upgradeOpts...)
 			})
 		}
 	}

testing/integration/upgrade_standalone_test.go

@@ -40,11 +40,11 @@ func TestStandaloneUpgrade(t *testing.T) {
 			unprivilegedAvailable = true
 		}
 		t.Run(fmt.Sprintf("Upgrade %s to %s (privileged)", startVersion, define.Version()), func(t *testing.T) {
-			testStandaloneUpgradeSucceeded(t, startVersion, define.Version(), atesting.ArtifactFetcher(), upgradetest.WithUnprivileged(false))
+			testStandaloneUpgrade(t, startVersion, define.Version(), atesting.ArtifactFetcher(), upgradetest.WithUnprivileged(false))
 		})
 		if unprivilegedAvailable {
 			t.Run(fmt.Sprintf("Upgrade %s to %s (unprivileged)", startVersion, define.Version()), func(t *testing.T) {
-				testStandaloneUpgradeSucceeded(t, startVersion, define.Version(), atesting.ArtifactFetcher(), upgradetest.WithUnprivileged(true))
+				testStandaloneUpgrade(t, startVersion, define.Version(), atesting.ArtifactFetcher(), upgradetest.WithUnprivileged(true))
 			})
 		}
 	}

testing/upgradetest/upgrader.go

@@ -55,7 +55,7 @@ type UpgradeOpts struct {
 	postInstallHook        func() error
 	preUpgradeHook         func() error
 	postUpgradeHook        func() error
-	postWatcherSuccessHook func(context.Context, *atesting.Fixture) error
+	PostWatcherSuccessHook func(context.Context, *atesting.Fixture) error
 }
 
 type UpgradeOpt func(opts *UpgradeOpts)
@@ -130,7 +130,7 @@ func WithPostUpgradeHook(hook func() error) UpgradeOpt {
 // and the upgrade watcher has terminated as well.
 func WithPostWatcherSuccessHook(hook func(context.Context, *atesting.Fixture) error) UpgradeOpt {
 	return func(opts *UpgradeOpts) {
-		opts.postWatcherSuccessHook = hook
+		opts.PostWatcherSuccessHook = hook
 	}
 }
 
@@ -444,8 +444,8 @@ func PerformUpgrade(
 		}
 	}
 
-	if upgradeOpts.postWatcherSuccessHook != nil {
-		if err := upgradeOpts.postWatcherSuccessHook(ctx, endFixture); err != nil {
+	if upgradeOpts.PostWatcherSuccessHook != nil {
+		if err := upgradeOpts.PostWatcherSuccessHook(ctx, endFixture); err != nil {
 			return fmt.Errorf("post watcher success hook failed: %w", err)
 		}
 	}