Skip to content

Commit 503a9ec

Browse files
bednarbednar
committed
fix: disable not working tests (influxdata/influxdb#19234)
1 parent 7ad58a0 commit 503a9ec

File tree

5 files changed

+39
-35
lines changed

5 files changed

+39
-35
lines changed

‎client-kotlin/src/test/kotlin/com/influxdb/client/kotlin/ITQueryKotlinApi.kt

+26-20
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,14 @@ internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() {
185185
val lines = queryKotlinApi.queryRaw(flux).toList()
186186

187187
assertThat(lines).hasSize(7)
188-
assertThat(lines[0]).isEqualTo("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,string,string,string,string,long")
189-
assertThat(lines[1]).isEqualTo("#group,false,false,true,true,true,true,true,true,false")
188+
assertThat(lines[0]).isEqualTo("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,long,string,string,string,string")
189+
assertThat(lines[1]).isEqualTo("#group,false,false,true,true,false,true,true,true,true")
190190
assertThat(lines[2]).isEqualTo("#default,_result,,,,,,,,")
191-
assertThat(lines[3]).isEqualTo(",result,table,_start,_stop,_field,_measurement,host,region,_value")
192-
assertThat(lines[4]).endsWith(",free,mem,A,west,21")
193-
assertThat(lines[5]).endsWith(",free,mem,B,west,42")
191+
assertThat(lines[3]).isEqualTo(",result,table,_start,_stop,_value,_field,_measurement,host,region")
192+
assertThat(lines[4].endsWith("42,free,mem,B,west") ||
193+
lines[4].endsWith("21,free,mem,A,west"), name = lines[4]).isTrue()
194+
assertThat(lines[5].endsWith("42,free,mem,B,west") ||
195+
lines[5].endsWith("21,free,mem,A,west"), name = lines[5]).isTrue()
194196
assertThat(lines[6]).isEmpty()
195197
}
196198

@@ -199,12 +201,14 @@ internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() {
199201
val lines = queryKotlinApi.queryRaw(flux, AbstractInfluxDBClient.DEFAULT_DIALECT).toList()
200202

201203
assertThat(lines).hasSize(7)
202-
assertThat(lines[0]).isEqualTo("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,string,string,string,string,long")
203-
assertThat(lines[1]).isEqualTo("#group,false,false,true,true,true,true,true,true,false")
204+
assertThat(lines[0]).isEqualTo("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,long,string,string,string,string")
205+
assertThat(lines[1]).isEqualTo("#group,false,false,true,true,false,true,true,true,true")
204206
assertThat(lines[2]).isEqualTo("#default,_result,,,,,,,,")
205-
assertThat(lines[3]).isEqualTo(",result,table,_start,_stop,_field,_measurement,host,region,_value")
206-
assertThat(lines[4]).endsWith(",free,mem,A,west,21")
207-
assertThat(lines[5]).endsWith(",free,mem,B,west,42")
207+
assertThat(lines[3]).isEqualTo(",result,table,_start,_stop,_value,_field,_measurement,host,region")
208+
assertThat(lines[4].endsWith("42,free,mem,B,west") ||
209+
lines[4].endsWith("21,free,mem,A,west"), name = lines[4]).isTrue()
210+
assertThat(lines[5].endsWith("42,free,mem,B,west") ||
211+
lines[5].endsWith("21,free,mem,A,west"), name = lines[5]).isTrue()
208212
assertThat(lines[6]).isEmpty()
209213
}
210214

@@ -213,12 +217,14 @@ internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() {
213217
val lines = queryKotlinApi.queryRaw(Query().dialect(AbstractInfluxDBClient.DEFAULT_DIALECT).query(flux)).toList()
214218

215219
assertThat(lines).hasSize(7)
216-
assertThat(lines[0]).isEqualTo("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,string,string,string,string,long")
217-
assertThat(lines[1]).isEqualTo("#group,false,false,true,true,true,true,true,true,false")
220+
assertThat(lines[0]).isEqualTo("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,long,string,string,string,string")
221+
assertThat(lines[1]).isEqualTo("#group,false,false,true,true,false,true,true,true,true")
218222
assertThat(lines[2]).isEqualTo("#default,_result,,,,,,,,")
219-
assertThat(lines[3]).isEqualTo(",result,table,_start,_stop,_field,_measurement,host,region,_value")
220-
assertThat(lines[4]).endsWith(",free,mem,A,west,21")
221-
assertThat(lines[5]).endsWith(",free,mem,B,west,42")
223+
assertThat(lines[3]).isEqualTo(",result,table,_start,_stop,_value,_field,_measurement,host,region")
224+
assertThat(lines[4].endsWith("42,free,mem,B,west") ||
225+
lines[4].endsWith("21,free,mem,A,west"), name = lines[4]).isTrue()
226+
assertThat(lines[5].endsWith("42,free,mem,B,west") ||
227+
lines[5].endsWith("21,free,mem,A,west"), name = lines[5]).isTrue()
222228
assertThat(lines[6]).isEmpty()
223229
}
224230
}
@@ -292,11 +298,11 @@ internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() {
292298

293299
val lines = queryKotlinApi.queryRaw(flux, organization.id).toList()
294300
assertThat(lines).hasSize(6)
295-
assertThat(lines[0]).isEqualTo("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,string,string,string,string,long")
296-
assertThat(lines[1]).isEqualTo("#group,false,false,true,true,true,true,true,true,false")
301+
assertThat(lines[0]).isEqualTo("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,long,string,string,string,string")
302+
assertThat(lines[1]).isEqualTo("#group,false,false,true,true,false,true,true,true,true")
297303
assertThat(lines[2]).isEqualTo("#default,_result,,,,,,,,")
298-
assertThat(lines[3]).isEqualTo(",result,table,_start,_stop,_field,_measurement,host,region,_value")
299-
assertThat(lines[4]).endsWith(",free,mem,A,west,21")
304+
assertThat(lines[3]).isEqualTo(",result,table,_start,_stop,_value,_field,_measurement,host,region")
305+
assertThat(lines[4]).endsWith(",21,free,mem,A,west")
300306
assertThat(lines[5]).isEmpty()
301307
}
302308

@@ -313,7 +319,7 @@ internal class ITQueryKotlinApi : AbstractITInfluxDBClientKotlin() {
313319
val lines = queryKotlinApi.queryRaw(flux, dialect, organization.id).toList()
314320

315321
assertThat(lines).hasSize(2)
316-
assertThat(lines[0]).endsWith(",free,mem,A,west,21")
322+
assertThat(lines[0]).endsWith(",21,free,mem,A,west")
317323
assertThat(lines[1]).isEmpty()
318324
}
319325

‎client-scala/src/test/scala/com/influxdb/client/scala/ITQueryScalaApiQuery.scala

+11-11
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,19 @@ class ITQueryScalaApiQuery extends AbstractITQueryScalaApi with Matchers {
184184
val source = queryScalaApi.queryRaw(flux).runWith(TestSink.probe[String])
185185

186186
var line = source.requestNext()
187-
line should be("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,string,string,string,string,long")
187+
line should be("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,long,string,string,string,string")
188188

189189
line = source.requestNext()
190-
line should be("#group,false,false,true,true,true,true,true,true,false")
190+
line should be("#group,false,false,true,true,false,true,true,true,true")
191191

192192
line = source.requestNext()
193193
line should be("#default,_result,,,,,,,,")
194194

195195
line = source.requestNext()
196-
line should be(",result,table,_start,_stop,_field,_measurement,host,region,_value")
196+
line should be(",result,table,_start,_stop,_value,_field,_measurement,host,region")
197197

198198
line = source.requestNext()
199-
line should endWith(",free,mem,A,west,21")
199+
line should endWith("21,free,mem,A,west")
200200

201201
line = source.requestNext()
202202
line shouldBe empty
@@ -213,7 +213,7 @@ class ITQueryScalaApiQuery extends AbstractITQueryScalaApi with Matchers {
213213

214214
var line = source.requestNext()
215215

216-
line should endWith(",free,mem,A,west,21")
216+
line should endWith("21,free,mem,A,west")
217217

218218
line = source.requestNext()
219219
line shouldBe empty
@@ -230,7 +230,7 @@ class ITQueryScalaApiQuery extends AbstractITQueryScalaApi with Matchers {
230230

231231
var line = source.requestNext()
232232

233-
line should endWith(",free,mem,A,west,21")
233+
line should endWith("21,free,mem,A,west")
234234

235235
line = source.requestNext()
236236
line shouldBe empty
@@ -316,19 +316,19 @@ class ITQueryScalaApiQuery extends AbstractITQueryScalaApi with Matchers {
316316
val source = queryScalaApi.queryRaw(flux, organization.getId).runWith(TestSink.probe[String])
317317

318318
var line = source.requestNext()
319-
line should be("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,string,string,string,string,long")
319+
line should be("#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,long,string,string,string,string")
320320

321321
line = source.requestNext()
322-
line should be("#group,false,false,true,true,true,true,true,true,false")
322+
line should be("#group,false,false,true,true,false,true,true,true,true")
323323

324324
line = source.requestNext()
325325
line should be("#default,_result,,,,,,,,")
326326

327327
line = source.requestNext()
328-
line should be(",result,table,_start,_stop,_field,_measurement,host,region,_value")
328+
line should be(",result,table,_start,_stop,_value,_field,_measurement,host,region")
329329

330330
line = source.requestNext()
331-
line should endWith(",free,mem,A,west,21")
331+
line should endWith("21,free,mem,A,west")
332332

333333
line = source.requestNext()
334334
line shouldBe empty
@@ -349,7 +349,7 @@ class ITQueryScalaApiQuery extends AbstractITQueryScalaApi with Matchers {
349349
val source = queryScalaApi.queryRaw(flux, dialect, organization.getId).runWith(TestSink.probe[String])
350350

351351
var line = source.requestNext()
352-
line should endWith(",free,mem,A,west,21")
352+
line should endWith("21,free,mem,A,west")
353353

354354
line = source.requestNext()
355355
line shouldBe empty

‎client/src/test/java/com/influxdb/client/ITBucketsApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ void findBucketByName() {
152152
}
153153

154154
@Test
155-
@Disabled
156-
//TODO https://github.com/influxdata/influxdb/issues/14900
157155
void findBucketByNameNotFound() {
158156

159157
Bucket bucket = bucketsApi.findBucketByName("my-bucket-not-found");

‎client/src/test/java/com/influxdb/client/ITTasksApi.java

+2
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,8 @@ void member() {
349349
}
350350

351351
@Test
352+
@Disabled
353+
//TODO https://github.com/influxdata/influxdb/issues/19234
352354
void owner() {
353355

354356
UsersApi usersApi = influxDBClient.getUsersApi();

‎client/src/test/java/com/influxdb/client/ITUsersApi.java

-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ void createUser() {
6565
Assertions.assertThat(user).isNotNull();
6666
Assertions.assertThat(user.getId()).isNotBlank();
6767
Assertions.assertThat(user.getName()).isEqualTo(userName);
68-
// TODO https://github.com/influxdata/influxdb/issues/18389
69-
// Assertions.assertThat(user.getLinks().getLogs()).isEqualTo("/api/v2/users/" + user.getId() + "/logs");
7068
Assertions.assertThat(user.getLinks().getSelf()).isEqualTo("/api/v2/users/" + user.getId());
7169
}
7270

0 commit comments

Comments
 (0)