ensure conductor services are closed

Author: danyalprout

op-e2e/sequencer_failover_setup.go

@@ -59,7 +59,7 @@ func (c *conductor) RPCEndpoint() string {
 	return fmt.Sprintf("http://%s:%d", localhost, c.rpcPort)
 }
 
-func setupSequencerFailoverTest(t *testing.T) (*System, map[string]*conductor) {
+func setupSequencerFailoverTest(t *testing.T) (*System, map[string]*conductor, func()) {
 	InitParallel(t)
 	ctx := context.Background()
 
@@ -129,7 +129,11 @@ func setupSequencerFailoverTest(t *testing.T) (*System, map[string]*conductor) {
 	require.True(t, healthy(t, ctx, c2))
 	require.True(t, healthy(t, ctx, c3))
 
-	return sys, conductors
+	return sys, conductors, func() {
+		for _, c := range conductors {
+			_ = c.service.Stop(ctx)
+		}
+	}
 }
 
 func setupHAInfra(t *testing.T, ctx context.Context) (*System, map[string]*conductor, error) {

op-e2e/sequencer_failover_test.go

@@ -14,8 +14,9 @@ import (
 // [Category: Initial Setup]
 // In this test, we test that we can successfully setup a working cluster.
 func TestSequencerFailover_SetupCluster(t *testing.T) {
-	sys, conductors := setupSequencerFailoverTest(t)
+	sys, conductors, cleanup := setupSequencerFailoverTest(t)
 	defer sys.Close()
+	defer cleanup()
 
 	require.Equal(t, 3, len(conductors), "Expected 3 conductors")
 	for _, con := range conductors {
@@ -27,8 +28,9 @@ func TestSequencerFailover_SetupCluster(t *testing.T) {
 // In this test, we test all rpcs exposed by conductor.
 func TestSequencerFailover_ConductorRPC(t *testing.T) {
 	ctx := context.Background()
-	sys, conductors := setupSequencerFailoverTest(t)
+	sys, conductors, cleanup := setupSequencerFailoverTest(t)
 	defer sys.Close()
+	defer cleanup()
 
 	// SequencerHealthy, Leader, AddServerAsVoter are used in setup already.
 
@@ -107,6 +109,7 @@ func TestSequencerFailover_ConductorRPC(t *testing.T) {
 		)
 	})
 	require.NoError(t, err)
+	defer nonvoter.service.Stop(ctx)
 
 	err = leader.client.AddServerAsNonvoter(ctx, VerifierName, nonvoter.ConsensusEndpoint())
 	require.NoError(t, err, "Expected leader to add non-voter")
@@ -144,8 +147,9 @@ func TestSequencerFailover_ConductorRPC(t *testing.T) {
 // [Category: Sequencer Failover]
 // Test that the sequencer can successfully failover to a new sequencer once the active sequencer goes down.
 func TestSequencerFailover_ActiveSequencerDown(t *testing.T) {
-	sys, conductors := setupSequencerFailoverTest(t)
+	sys, conductors, cleanup := setupSequencerFailoverTest(t)
 	defer sys.Close()
+	defer cleanup()
 
 	ctx := context.Background()
 	leaderId, leader := findLeader(t, conductors)