Skip to content

Commit 3bff7ca

Browse files
orianarorianar
committed
fix tests
1 parent 55e83b2 commit 3bff7ca

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

‎test/functionalTest/cases/4666_kafka/kafka_subscription_parsing_errors.test‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ payload='{
8181
},
8282
"notification": {
8383
"http": {
84-
"url": "mqtt://localhost"
84+
"url": "mqtt://kafka1"
8585
},
8686
"kafka": {
87-
"url": "localhost:9092",
87+
"url": "kafka1:9092",
8888
"topic": "orion_notif"
8989
},
9090
"attrs": [
@@ -187,7 +187,7 @@ payload='{
187187
},
188188
"notification": {
189189
"kafka": {
190-
"url": "http://localhost:9999",
190+
"url": "http://kafka1:9999",
191191
"topic": "orion_notif"
192192
},
193193
"attrs": [
@@ -214,7 +214,7 @@ payload='{
214214
},
215215
"notification": {
216216
"kafka": {
217-
"url": "kafka://localhost:9092/path/not/valid",
217+
"url": "kafka://kafka1:9092/path/not/valid",
218218
"topic": "orion_notif"
219219
},
220220
"attrs": [
@@ -241,7 +241,7 @@ payload='{
241241
},
242242
"notification": {
243243
"kafka": {
244-
"url": "kafka://localhost:9092"
244+
"url": "kafka://kafka1:9092"
245245
},
246246
"attrs": [
247247
"A1"
@@ -267,7 +267,7 @@ payload='{
267267
},
268268
"notification": {
269269
"kafka": {
270-
"url": "kafka://localhost:9092",
270+
"url": "kafka://kafka1:9092",
271271
"topic": 1234
272272
},
273273
"attrs": [
@@ -294,7 +294,7 @@ payload='{
294294
},
295295
"notification": {
296296
"kafka": {
297-
"url": "kafka://localhost:9092",
297+
"url": "kafka://kafka1:9092",
298298
"topic": ""
299299
},
300300
"attrs": [
@@ -321,7 +321,7 @@ payload='{
321321
},
322322
"notification": {
323323
"http": {
324-
"url": "kafka://localhost:9092"
324+
"url": "kafka://kafka1:9092"
325325
},
326326
"attrs": [
327327
"A1"

‎test/functionalTest/cases/4666_kafka/kafka_subscription_update.test‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ brokerStart CB
3030
--SHELL--
3131

3232
#
33-
# 01. Create kafka sub url=kafka:///localhost:9092, topic=orion
34-
# 02. Get sub, see url=kafka://localhost:9092, topic=orion
33+
# 01. Create kafka sub url=kafka:///kafka1:9092, topic=orion
34+
# 02. Get sub, see url=kafka://kafka1:9092, topic=orion
3535
# 03. Update sub element different to notification
36-
# 04. Get sub, see url=kafka://localhost:9092, topic=orion
37-
# 05. Update sub with url=kafka://localhost:9093, topic=cb
38-
# 06. Get sub, see url=kafka://localhost:9093, topic=cb
36+
# 04. Get sub, see url=kafka://kafka1:9092, topic=orion
37+
# 05. Update sub with url=kafka://kafka1:9093, topic=cb
38+
# 06. Get sub, see url=kafka://kafka1:9093, topic=cb
3939
# 07. Update sub to http sub
4040
# 08. Get sub, see http element
41-
# 09. Update sub to kafka url=kafka://localhost:9094, topic=orionbk
42-
# 10. Get sub, see url=kafka://localhost:9094, topic=orionbk
41+
# 09. Update sub to kafka url=kafka://kafka1:9094, topic=orionbk
42+
# 10. Get sub, see url=kafka://kafka1:9094, topic=orionbk
4343
#
4444

45-
echo "01. Create kafka sub url=kafka://localhost:9092, topic=orion"
45+
echo "01. Create kafka sub url=kafka://kafka1:9092, topic=orion"
4646
echo "============================================================"
4747
payload='{
4848
"description": "Original sub",
@@ -56,7 +56,7 @@ payload='{
5656
},
5757
"notification": {
5858
"kafka": {
59-
"url": "kafka://localhost:9092",
59+
"url": "kafka://kafka1:9092",
6060
"topic": "orion"
6161
}
6262
}
@@ -69,7 +69,7 @@ echo
6969
SUB_ID=$(echo "$_responseHeaders" | grep Location | awk -F/ '{ print $4 }' | tr -d "\r\n")
7070

7171

72-
echo "02. Get sub, see url=kafka://localhost:9092, topic=orion"
72+
echo "02. Get sub, see url=kafka://kafka1:9092, topic=orion"
7373
echo "========================================================="
7474
orionCurl --url /v2/subscriptions/$SUB_ID
7575
echo
@@ -86,19 +86,19 @@ echo
8686
echo
8787

8888

89-
echo "04. Get sub, see url=kafka://localhost:9092, topic=orion"
89+
echo "04. Get sub, see url=kafka://kafka1:9092, topic=orion"
9090
echo "========================================================"
9191
orionCurl --url /v2/subscriptions/$SUB_ID
9292
echo
9393
echo
9494

9595

96-
echo "05. Update sub with url=kafka://localhost:9093, topic=cb"
96+
echo "05. Update sub with url=kafka://kafka1:9093, topic=cb"
9797
echo "========================================================"
9898
payload='{
9999
"notification": {
100100
"kafka": {
101-
"url": "kafka://localhost:9093",
101+
"url": "kafka://kafka1:9093",
102102
"topic": "cb"
103103
}
104104
}
@@ -108,7 +108,7 @@ echo
108108
echo
109109

110110

111-
echo "06. Get sub, see url=kafka://localhost:9093, topic=cb"
111+
echo "06. Get sub, see url=kafka://kafka1:9093, topic=cb"
112112
echo "====================================================="
113113
orionCurl --url /v2/subscriptions/$SUB_ID
114114
echo
@@ -120,7 +120,7 @@ echo "=========================="
120120
payload='{
121121
"notification": {
122122
"http": {
123-
"url": "http://localhost:9999"
123+
"url": "http://kafka1:9999"
124124
}
125125
}
126126
}'
@@ -136,12 +136,12 @@ echo
136136
echo
137137

138138

139-
echo "09. Update sub to kafka url=kafka://localhost:9094, topic=orionbk"
139+
echo "09. Update sub to kafka url=kafka://kafka1:9094, topic=orionbk"
140140
echo "================================================================="
141141
payload='{
142142
"notification": {
143143
"kafka": {
144-
"url": "kafka://localhost:9094",
144+
"url": "kafka://kafka1:9094",
145145
"topic": "orionbk"
146146
}
147147
}
@@ -151,15 +151,15 @@ echo
151151
echo
152152

153153

154-
echo "10. Get sub, see url=kafka://localhost:9094, topic=orionbk"
154+
echo "10. Get sub, see url=kafka://kafka1:9094, topic=orionbk"
155155
echo "=========================================================="
156156
orionCurl --url /v2/subscriptions/$SUB_ID
157157
echo
158158
echo
159159

160160

161161
--REGEXPECT--
162-
01. Create kafka sub url=kafka://localhost:9092, topic=orion
162+
01. Create kafka sub url=kafka://kafka1:9092, topic=orion
163163
============================================================
164164
HTTP/1.1 201 Created
165165
Date: REGEX(.*)
@@ -169,13 +169,13 @@ Content-Length: 0
169169

170170

171171

172-
02. Get sub, see url=kafka://localhost:9092, topic=orion
172+
02. Get sub, see url=kafka://kafka1:9092, topic=orion
173173
=========================================================
174174
HTTP/1.1 200 OK
175175
Date: REGEX(.*)
176176
Fiware-Correlator: REGEX([0-9a-f\-]{36})
177177
Content-Type: application/json
178-
Content-Length: 337
178+
Content-Length: 334
179179

180180
{
181181
"description": "Original sub",
@@ -186,7 +186,7 @@ Content-Length: 337
186186
"covered": false,
187187
"kafka": {
188188
"topic": "orion",
189-
"url": "kafka://localhost:9092"
189+
"url": "kafka://kafka1:9092"
190190
},
191191
"onlyChangedAttrs": false
192192
},
@@ -214,13 +214,13 @@ Fiware-Correlator: REGEX([0-9a-f\-]{36})
214214

215215

216216

217-
04. Get sub, see url=kafka://localhost:9092, topic=orion
217+
04. Get sub, see url=kafka://kafka1:9092, topic=orion
218218
========================================================
219219
HTTP/1.1 200 OK
220220
Date: REGEX(.*)
221221
Fiware-Correlator: REGEX([0-9a-f\-]{36})
222222
Content-Type: application/json
223-
Content-Length: 337
223+
Content-Length: 334
224224

225225
{
226226
"description": "Modified sub",
@@ -231,7 +231,7 @@ Content-Length: 337
231231
"covered": false,
232232
"kafka": {
233233
"topic": "orion",
234-
"url": "kafka://localhost:9092"
234+
"url": "kafka://kafka1:9092"
235235
},
236236
"onlyChangedAttrs": false
237237
},
@@ -251,21 +251,21 @@ Content-Length: 337
251251
}
252252

253253

254-
05. Update sub with url=kafka://localhost:9093, topic=cb
254+
05. Update sub with url=kafka://kafka1:9093, topic=cb
255255
========================================================
256256
HTTP/1.1 204 No Content
257257
Date: REGEX(.*)
258258
Fiware-Correlator: REGEX([0-9a-f\-]{36})
259259

260260

261261

262-
06. Get sub, see url=kafka://localhost:9093, topic=cb
262+
06. Get sub, see url=kafka://kafka1:9093, topic=cb
263263
=====================================================
264264
HTTP/1.1 200 OK
265265
Date: REGEX(.*)
266266
Fiware-Correlator: REGEX([0-9a-f\-]{36})
267267
Content-Type: application/json
268-
Content-Length: 334
268+
Content-Length: 331
269269

270270
{
271271
"description": "Modified sub",
@@ -276,7 +276,7 @@ Content-Length: 334
276276
"covered": false,
277277
"kafka": {
278278
"topic": "cb",
279-
"url": "kafka://localhost:9093"
279+
"url": "kafka://kafka1:9093"
280280
},
281281
"onlyChangedAttrs": false
282282
},
@@ -310,7 +310,7 @@ HTTP/1.1 200 OK
310310
Date: REGEX(.*)
311311
Fiware-Correlator: REGEX([0-9a-f\-]{36})
312312
Content-Type: application/json
313-
Content-Length: 319
313+
Content-Length: 316
314314

315315
{
316316
"description": "Modified sub",
@@ -320,7 +320,7 @@ Content-Length: 319
320320
"attrsFormat": "normalized",
321321
"covered": false,
322322
"http": {
323-
"url": "http://localhost:9999"
323+
"url": "http://kafka1:9999"
324324
},
325325
"onlyChangedAttrs": false
326326
},
@@ -340,21 +340,21 @@ Content-Length: 319
340340
}
341341

342342

343-
09. Update sub to kafka url=kafka://localhost:9094, topic=orionbk
343+
09. Update sub to kafka url=kafka://kafka1:9094, topic=orionbk
344344
=================================================================
345345
HTTP/1.1 204 No Content
346346
Date: REGEX(.*)
347347
Fiware-Correlator: REGEX([0-9a-f\-]{36})
348348

349349

350350

351-
10. Get sub, see url=kafka://localhost:9094, topic=orionbk
351+
10. Get sub, see url=kafka://kafka1:9094, topic=orionbk
352352
==========================================================
353353
HTTP/1.1 200 OK
354354
Date: REGEX(.*)
355355
Fiware-Correlator: REGEX([0-9a-f\-]{36})
356356
Content-Type: application/json
357-
Content-Length: 339
357+
Content-Length: 336
358358

359359
{
360360
"description": "Modified sub",
@@ -365,7 +365,7 @@ Content-Length: 339
365365
"covered": false,
366366
"kafka": {
367367
"topic": "orionbk",
368-
"url": "kafka://localhost:9094"
368+
"url": "kafka://kafka1:9094"
369369
},
370370
"onlyChangedAttrs": false
371371
},

0 commit comments

Comments
 (0)