Skip to content

Commit

Permalink
Merge pull request #4828 from onetechnical/relbeta3.12.2
Browse files Browse the repository at this point in the history
  • Loading branch information
algojohnlee authored Nov 22, 2022
2 parents bacdf8d + 6f01d48 commit 3583908
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion buildnumber.dat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1
2
4 changes: 4 additions & 0 deletions network/wsNetwork_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2681,6 +2681,10 @@ func TestPreparePeerData(t *testing.T) {
func TestWebsocketNetworkTelemetryTCP(t *testing.T) {
partitiontest.PartitionTest(t)

if strings.ToUpper(os.Getenv("CIRCLECI")) == "TRUE" {
t.Skip("Flaky on CIRCLECI")
}

// start two networks and send 2 messages from A to B
closed := false
netA, netB, counter, closeFunc := setupWebsocketNetworkAB(t, 2)
Expand Down

0 comments on commit 3583908

Please # to comment.