Skip to content

Commit 4854260

Browse files
skudasovskudasov
committed
wait for http port, log is not reliable
1 parent 0e411f1 commit 4854260

File tree

3 files changed

+4
-84
lines changed

3 files changed

+4
-84
lines changed

‎framework/components/clnode/clnode.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"path/filepath"
1616
"sync"
1717
"text/template"
18-
"time"
1918
)
2019

2120
const (
@@ -167,18 +166,18 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
167166
"/bin/sh", "-c",
168167
"chainlink -c /config/config -c /config/overrides -c /config/user-overrides -s /config/secrets -s /config/secrets-overrides -s /config/user-secrets-overrides node start -d -p /config/node_password -a /config/apicredentials",
169168
},
170-
WaitingFor: wait.ForLog("Listening and serving HTTP").WithStartupTimeout(2 * time.Minute),
169+
WaitingFor: wait.ForHTTP("/").WithPort(DefaultHTTPPort),
171170
}
172171
if in.Node.HTTPPort != 0 && in.Node.P2PPort != 0 {
173172
req.HostConfigModifier = func(h *container.HostConfig) {
174173
h.PortBindings = nat.PortMap{
175-
"6688/tcp": []nat.PortBinding{
174+
nat.Port(httpPort): []nat.PortBinding{
176175
{
177176
HostIP: "0.0.0.0",
178177
HostPort: fmt.Sprintf("%d/tcp", in.Node.HTTPPort),
179178
},
180179
},
181-
"6690/udp": []nat.PortBinding{
180+
nat.Port(p2pPort): []nat.PortBinding{
182181
{
183182
HostIP: "0.0.0.0",
184183
HostPort: fmt.Sprintf("%d/udp", in.Node.P2PPort),

‎framework/examples/myproject/go.mod‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ replace (
88
)
99

1010
require (
11-
github.com/smartcontractkit/chainlink-testing-framework/framework v0.2.0
11+
github.com/smartcontractkit/chainlink-testing-framework/framework v0.2.1
1212
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2
1313
github.com/stretchr/testify v1.9.0
1414
)
@@ -27,7 +27,6 @@ require (
2727
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
2828
github.com/armon/go-metrics v0.4.1 // indirect
2929
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
30-
github.com/atotto/clipboard v0.1.4 // indirect
3130
github.com/aws/aws-sdk-go v1.45.25 // indirect
3231
github.com/aws/aws-sdk-go-v2 v1.31.0 // indirect
3332
github.com/aws/aws-sdk-go-v2/config v1.27.39 // indirect
@@ -43,26 +42,16 @@ require (
4342
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 // indirect
4443
github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 // indirect
4544
github.com/aws/smithy-go v1.21.0 // indirect
46-
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
4745
github.com/benbjohnson/clock v1.3.5 // indirect
4846
github.com/beorn7/perks v1.0.1 // indirect
4947
github.com/buger/jsonparser v1.1.1 // indirect
5048
github.com/bytedance/sonic v1.12.3 // indirect
5149
github.com/bytedance/sonic/loader v0.2.0 // indirect
5250
github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b // indirect
5351
github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 // indirect
54-
github.com/catppuccin/go v0.2.0 // indirect
5552
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
5653
github.com/cespare/xxhash v1.1.0 // indirect
5754
github.com/cespare/xxhash/v2 v2.3.0 // indirect
58-
github.com/charmbracelet/bubbles v0.20.0 // indirect
59-
github.com/charmbracelet/bubbletea v1.1.1 // indirect
60-
github.com/charmbracelet/huh v0.6.0 // indirect
61-
github.com/charmbracelet/huh/spinner v0.0.0-20241028115900-20a4d21717a8 // indirect
62-
github.com/charmbracelet/lipgloss v0.13.0 // indirect
63-
github.com/charmbracelet/x/ansi v0.2.3 // indirect
64-
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
65-
github.com/charmbracelet/x/term v0.2.0 // indirect
6655
github.com/cloudwego/base64x v0.1.4 // indirect
6756
github.com/cloudwego/iasm v0.2.0 // indirect
6857
github.com/coder/websocket v1.8.12 // indirect
@@ -72,7 +61,6 @@ require (
7261
github.com/coreos/go-semver v0.3.0 // indirect
7362
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7463
github.com/cpuguy83/dockercfg v0.3.1 // indirect
75-
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
7664
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7765
github.com/dennwc/varint v1.0.0 // indirect
7866
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -83,7 +71,6 @@ require (
8371
github.com/dustin/go-humanize v1.0.1 // indirect
8472
github.com/edsrzf/mmap-go v1.1.0 // indirect
8573
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
86-
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
8774
github.com/ethereum/go-ethereum v1.14.11 // indirect
8875
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
8976
github.com/fatih/color v1.16.0 // indirect
@@ -155,18 +142,14 @@ require (
155142
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
156143
github.com/kylelemons/godebug v1.1.0 // indirect
157144
github.com/leodido/go-urn v1.4.0 // indirect
158-
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
159145
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
160146
github.com/magiconair/properties v1.8.7 // indirect
161147
github.com/mailru/easyjson v0.7.7 // indirect
162148
github.com/mattn/go-colorable v0.1.13 // indirect
163149
github.com/mattn/go-isatty v0.0.20 // indirect
164-
github.com/mattn/go-localereader v0.0.1 // indirect
165-
github.com/mattn/go-runewidth v0.0.16 // indirect
166150
github.com/miekg/dns v1.1.56 // indirect
167151
github.com/mitchellh/copystructure v1.0.0 // indirect
168152
github.com/mitchellh/go-homedir v1.1.0 // indirect
169-
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
170153
github.com/mitchellh/mapstructure v1.5.0 // indirect
171154
github.com/mitchellh/reflectwalk v1.0.1 // indirect
172155
github.com/moby/docker-image-spec v1.3.1 // indirect
@@ -177,9 +160,6 @@ require (
177160
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
178161
github.com/modern-go/reflect2 v1.0.2 // indirect
179162
github.com/morikuni/aec v1.0.0 // indirect
180-
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
181-
github.com/muesli/cancelreader v0.2.2 // indirect
182-
github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a // indirect
183163
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
184164
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
185165
github.com/oklog/ulid v1.3.1 // indirect
@@ -189,7 +169,6 @@ require (
189169
github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
190170
github.com/opentracing/opentracing-go v1.2.0 // indirect
191171
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
192-
github.com/pelletier/go-toml v1.9.5 // indirect
193172
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
194173
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
195174
github.com/pkg/errors v0.9.1 // indirect
@@ -203,9 +182,7 @@ require (
203182
github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97 // indirect
204183
github.com/prometheus/procfs v0.15.1 // indirect
205184
github.com/prometheus/prometheus v0.47.2-0.20231010075449-4b9c19fe5510 // indirect
206-
github.com/rivo/uniseg v0.4.7 // indirect
207185
github.com/rs/zerolog v1.33.0 // indirect
208-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
209186
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
210187
github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
211188
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
@@ -225,9 +202,7 @@ require (
225202
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
226203
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
227204
github.com/ugorji/go/codec v1.2.12 // indirect
228-
github.com/urfave/cli/v2 v2.27.5 // indirect
229205
github.com/x448/float16 v0.8.4 // indirect
230-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
231206
github.com/yusufpapurcu/wmi v1.2.3 // indirect
232207
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
233208
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect

0 commit comments

Comments
 (0)