Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CCIP-4401: Skipping flaky reorg test #15438

Merged
merged 4 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion integration-tests/ccip-tests/smoke/ccip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"github.com/smartcontractkit/chainlink-testing-framework/lib/logging"
"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/ptr"

"github.com/smartcontractkit/chainlink/integration-tests/ccip-tests/utils"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_onramp"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/lock_release_token_pool"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/token_pool"
Expand Down Expand Up @@ -889,6 +889,7 @@ func TestSmokeCCIPReorgBelowFinality(t *testing.T) {
// doesn't go through and verifies f+1 nodes is able to detect reorg.
// Note: LogPollInterval interval is set as 1s to detect the reorg immediately
func TestSmokeCCIPReorgAboveFinalityAtDestination(t *testing.T) {
utils.SkipFlakey(t, "https://smartcontract-it.atlassian.net/browse/CCIP-4401")
t.Parallel()
t.Run("Above finality reorg in destination chain", func(t *testing.T) {
performAboveFinalityReorgAndValidate(t, "Destination")
Expand All @@ -900,6 +901,7 @@ func TestSmokeCCIPReorgAboveFinalityAtDestination(t *testing.T) {
// shouldn't even get initiated and verifies f+1 nodes is able to detect reorg.
// Note: LogPollInterval interval is set as 1s to detect the reorg immediately
func TestSmokeCCIPReorgAboveFinalityAtSource(t *testing.T) {
utils.SkipFlakey(t, "https://smartcontract-it.atlassian.net/browse/CCIP-4401")
t.Parallel()
t.Run("Above finality reorg in source chain", func(t *testing.T) {
performAboveFinalityReorgAndValidate(t, "Source")
Expand Down
5 changes: 5 additions & 0 deletions integration-tests/ccip-tests/utils/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ import (
"path/filepath"
"runtime"
"sync"
"testing"
)

func ProjectRoot() string {
_, b, _, _ := runtime.Caller(0)
return filepath.Join(filepath.Dir(b), "/..")
}

func SkipFlakey(t *testing.T, ticketURL string) {
t.Skip("Flakey", ticketURL)
}

// DeleteNilEntriesFromMap checks for nil entry in map, store all not-nil entries to another map and deallocates previous map
// Deleting keys from a map actually does not delete the key, It just sets the corresponding value to nil.
func DeleteNilEntriesFromMap(inputMap *sync.Map) *sync.Map {
Expand Down
Loading