From d8aa339cd5b53d81e2bb7cc8bdd729ef0aade086 Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 12 Oct 2023 18:43:07 -0600 Subject: [PATCH] [TT-628] Close the EVMClient connections on test cleanup (#10911) * [TT-628] Close the evmclient connections on cleanup They can sometimes log transactions aftet the test has completed due to them happening in a go routine if you don't close them beforehand. * merge conflict fixes --- integration-tests/docker/test_env/test_env.go | 6 ++++++ integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/integration-tests/docker/test_env/test_env.go b/integration-tests/docker/test_env/test_env.go index 34e3dd17e34..f7a37cc3606 100644 --- a/integration-tests/docker/test_env/test_env.go +++ b/integration-tests/docker/test_env/test_env.go @@ -261,6 +261,12 @@ func (te *CLClusterTestEnv) Cleanup() error { } } + // close EVMClient connections + if te.EVMClient != nil { + err := te.EVMClient.Close() + return err + } + return nil } diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 813199dfe9f..a170c00efa8 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -20,7 +20,7 @@ require ( github.com/rs/zerolog v1.30.0 github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-env v0.38.3 - github.com/smartcontractkit/chainlink-testing-framework v1.17.9 + github.com/smartcontractkit/chainlink-testing-framework v1.17.10 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20230922131214-122accb19ea6 github.com/smartcontractkit/ocr2keepers v0.7.27 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index e72f008d1cc..3cfc46e119d 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -2368,8 +2368,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231010203454-896f5c3c04d github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231010203454-896f5c3c04d1/go.mod h1:RIUJXn7EVp24TL2p4FW79dYjyno23x5mjt1nKN+5WEk= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20230901115736-bbabe542a918 h1:ByVauKFXphRlSNG47lNuxZ9aicu+r8AoNp933VRPpCw= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20230901115736-bbabe542a918/go.mod h1:/yp/sqD8Iz5GU5fcercjrw0ivJF7HDcupYg+Gjr7EPg= -github.com/smartcontractkit/chainlink-testing-framework v1.17.9 h1:dU5F457J4JtLziQszkyFdgrpX7BE0SweEQ+QFlRHiR4= -github.com/smartcontractkit/chainlink-testing-framework v1.17.9/go.mod h1:Q6vSDsN8qWs8K5+XYvbUAkvl1PyW6tqcYwLpCX8PV44= +github.com/smartcontractkit/chainlink-testing-framework v1.17.10 h1:FZJMIOTcmdCtaqTXisz430uq3IrC4VZQDE9krmhpm+c= +github.com/smartcontractkit/chainlink-testing-framework v1.17.10/go.mod h1:Q6vSDsN8qWs8K5+XYvbUAkvl1PyW6tqcYwLpCX8PV44= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU=