Fix test TestAddEVMSolanaLaneBidirectional

deployment/ccip/changeset/crossfamily/v1_6/cs_add_evm_solana_lane_test.go

@@ -8,6 +8,7 @@
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/gagliardetto/solana-go"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 	"github.com/stretchr/testify/require"
 
 	solOffRamp "github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/ccip_offramp"
@@ -16,14 +17,11 @@
 	solState "github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/state"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
-
 	crossfamily "github.com/smartcontractkit/chainlink/deployment/ccip/changeset/crossfamily/v1_6"
 	ccipChangesetSolana "github.com/smartcontractkit/chainlink/deployment/ccip/changeset/solana"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/testhelpers"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/v1_6"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview"
-	commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 )
 
@@ -116,11 +114,21 @@
 			}
 
 			// run the changeset
-			e, _, err = commonchangeset.ApplyChangesetsV2(t, e, []commonchangeset.ConfiguredChangeSet{
-				commonchangeset.Configure(crossfamily.AddEVMAndSolanaLaneChangeset, evmSolanaLaneCSInput),
-			})
+			out, err := crossfamily.AddEVMAndSolanaLaneChangeset.Apply(e, evmSolanaLaneCSInput)
 			require.NoError(t, err)
 
+			// if MCMS is enabled, we need to run the proposal
+			if tc.mcmsEnabled {
+				for _, prop := range out.MCMSTimelockProposals {
+					mcmProp := proposalutils.SignMCMSTimelockProposal(t, e, &prop)
+					// return the error so devs can ensure expected reversions
+					err = proposalutils.ExecuteMCMSProposalV2(t, e, mcmProp)
+					require.NoError(t, err)
+					err = proposalutils.ExecuteMCMSTimelockProposalV2(t, e, &prop)
+					require.NoError(t, err)
+				}
+			}
+
 			// Check that the changeset was applied
 			evmState, err = stateview.LoadOnchainState(e)
 			require.NoError(t, err)