Skip to content

Commit 238b122

Browse files
committed
debug ci
1 parent d7b1b0f commit 238b122

File tree

4 files changed

+171
-56
lines changed

4 files changed

+171
-56
lines changed

go.mod

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,40 @@
11
module github.com/questdb/go-questdb-client/v3
22

3-
go 1.23.0
4-
5-
toolchain go1.24.3
3+
go 1.19
64

75
require (
8-
github.com/stretchr/testify v1.10.0
9-
github.com/testcontainers/testcontainers-go v0.38.0
6+
github.com/stretchr/testify v1.9.0
7+
github.com/testcontainers/testcontainers-go v0.26.0
108
)
119

1210
require (
13-
dario.cat/mergo v1.0.1 // indirect
11+
dario.cat/mergo v1.0.0 // indirect
1412
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
15-
github.com/Microsoft/go-winio v0.6.2 // indirect
13+
github.com/Microsoft/go-winio v0.6.1 // indirect
1614
github.com/Microsoft/hcsshim v0.11.4 // indirect
1715
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
1816
github.com/containerd/containerd v1.7.12 // indirect
1917
github.com/containerd/log v0.1.0 // indirect
20-
github.com/cpuguy83/dockercfg v0.3.2 // indirect
18+
github.com/cpuguy83/dockercfg v0.3.1 // indirect
2119
github.com/davecgh/go-spew v1.1.1 // indirect
2220
github.com/docker/distribution v2.8.2+incompatible // indirect
23-
github.com/docker/docker v28.2.2+incompatible // indirect
21+
github.com/docker/docker v24.0.9+incompatible // indirect
2422
github.com/docker/go-connections v0.5.0 // indirect
2523
github.com/docker/go-units v0.5.0 // indirect
2624
github.com/go-ole/go-ole v1.3.0 // indirect
2725
github.com/gogo/protobuf v1.3.2 // indirect
2826
github.com/golang/protobuf v1.5.3 // indirect
2927
github.com/google/uuid v1.6.0 // indirect
30-
github.com/klauspost/compress v1.18.0 // indirect
28+
github.com/klauspost/compress v1.17.0 // indirect
3129
github.com/kr/text v0.2.0 // indirect
3230
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
33-
github.com/magiconair/properties v1.8.10 // indirect
31+
github.com/magiconair/properties v1.8.7 // indirect
3432
github.com/moby/patternmatcher v0.6.0 // indirect
35-
github.com/moby/sys/sequential v0.6.0 // indirect
33+
github.com/moby/sys/sequential v0.5.0 // indirect
3634
github.com/moby/term v0.5.0 // indirect
3735
github.com/morikuni/aec v1.0.0 // indirect
3836
github.com/opencontainers/go-digest v1.0.0 // indirect
39-
github.com/opencontainers/image-spec v1.1.1 // indirect
37+
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
4038
github.com/opencontainers/runc v1.1.5 // indirect
4139
github.com/pkg/errors v0.9.1 // indirect
4240
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -46,10 +44,10 @@ require (
4644
github.com/sirupsen/logrus v1.9.3 // indirect
4745
github.com/tklauser/go-sysconf v0.3.12 // indirect
4846
github.com/tklauser/numcpus v0.6.1 // indirect
49-
github.com/yusufpapurcu/wmi v1.2.4 // indirect
47+
github.com/yusufpapurcu/wmi v1.2.3 // indirect
5048
golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
5149
golang.org/x/mod v0.13.0 // indirect
52-
golang.org/x/sys v0.32.0 // indirect
50+
golang.org/x/sys v0.16.0 // indirect
5351
golang.org/x/tools v0.14.0 // indirect
5452
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
5553
google.golang.org/grpc v1.58.3 // indirect

http_integration_test.go

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ func (suite *integrationTestSuite) TestE2ESuccessfulHttpBasicAuthWithTlsProxy()
4242
ctx := context.Background()
4343

4444
questdbC, err := setupQuestDB(ctx, httpBasicAuth)
45-
assert.NoError(suite.T(), err)
45+
if err != nil {
46+
assert.Fail(suite.T(), err.Error())
47+
return
48+
}
4649
defer questdbC.Stop(ctx)
4750

4851
sender, err := qdb.NewLineSender(
@@ -52,23 +55,35 @@ func (suite *integrationTestSuite) TestE2ESuccessfulHttpBasicAuthWithTlsProxy()
5255
qdb.WithBasicAuth(basicAuthUser, basicAuthPass),
5356
qdb.WithTlsInsecureSkipVerify(),
5457
)
55-
assert.NoError(suite.T(), err)
58+
if err != nil {
59+
assert.Fail(suite.T(), err.Error())
60+
return
61+
}
5662
defer sender.Close(ctx)
5763

5864
err = sender.
5965
Table(testTable).
6066
StringColumn("str_col", "foobar").
6167
At(ctx, time.UnixMicro(1))
62-
assert.NoError(suite.T(), err)
68+
if err != nil {
69+
assert.Fail(suite.T(), err.Error())
70+
return
71+
}
6372

6473
err = sender.
6574
Table(testTable).
6675
StringColumn("str_col", "barbaz").
6776
At(ctx, time.UnixMicro(2))
68-
assert.NoError(suite.T(), err)
77+
if err != nil {
78+
assert.Fail(suite.T(), err.Error())
79+
return
80+
}
6981

7082
err = sender.Flush(ctx)
71-
assert.NoError(suite.T(), err)
83+
if err != nil {
84+
assert.Fail(suite.T(), err.Error())
85+
return
86+
}
7287

7388
expected := tableData{
7489
Columns: []column{
@@ -101,19 +116,34 @@ func (suite *integrationTestSuite) TestServerSideError() {
101116
)
102117

103118
questdbC, err := setupQuestDB(ctx, noAuth)
104-
assert.NoError(suite.T(), err)
119+
if err != nil {
120+
assert.Fail(suite.T(), err.Error())
121+
return
122+
}
105123

106124
sender, err = qdb.NewLineSender(ctx, qdb.WithHttp(), qdb.WithAddress(questdbC.httpAddress))
107-
assert.NoError(suite.T(), err)
125+
if err != nil {
126+
assert.Fail(suite.T(), err.Error())
127+
return
128+
}
108129

109130
err = sender.Table(testTable).Int64Column("long_col", 42).AtNow(ctx)
110-
assert.NoError(suite.T(), err)
131+
if err != nil {
132+
assert.Fail(suite.T(), err.Error())
133+
return
134+
}
111135
err = sender.Flush(ctx)
112-
assert.NoError(suite.T(), err)
136+
if err != nil {
137+
assert.Fail(suite.T(), err.Error())
138+
return
139+
}
113140

114141
// Now, use wrong type for the long_col.
115142
err = sender.Table(testTable).StringColumn("long_col", "42").AtNow(ctx)
116-
assert.NoError(suite.T(), err)
143+
if err != nil {
144+
assert.Fail(suite.T(), err.Error())
145+
return
146+
}
117147
err = sender.Flush(ctx)
118148
assert.Error(suite.T(), err)
119149
assert.ErrorContains(suite.T(), err, "my_test_table, column: long_col; cast error from protocol type: STRING to column type")

integration_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func setupQuestDB0(ctx context.Context, auth ilpAuthType, setupProxy bool) (*que
140140
req := testcontainers.ContainerRequest{
141141
Image: "questdb/questdb:9.0.2",
142142
ExposedPorts: []string{"9000/tcp", "9009/tcp"},
143-
WaitingFor: wait.ForHTTP("/").WithPort("9000"),
143+
WaitingFor: wait.ForHTTP("/ping").WithPort("9000"),
144144
Networks: []string{networkName},
145145
NetworkAliases: map[string][]string{networkName: {"questdb"}},
146146
Env: env,
@@ -155,7 +155,7 @@ func setupQuestDB0(ctx context.Context, auth ilpAuthType, setupProxy bool) (*que
155155
newNetwork, err := testcontainers.GenericNetwork(ctx, testcontainers.GenericNetworkRequest{
156156
NetworkRequest: testcontainers.NetworkRequest{
157157
Name: networkName,
158-
CheckDuplicate: false,
158+
CheckDuplicate: true,
159159
},
160160
})
161161
if err != nil {

0 commit comments

Comments
 (0)