Skip to content

Commit 7dfb921

Browse files
Ferenc-Ferenc-
committed
test: Refactor to use appropriate UT assertions where available
Signed-off-by: Ferenc Géczi <[email protected]>
1 parent c68595b commit 7dfb921

File tree

8 files changed

+352
-352
lines changed

8 files changed

+352
-352
lines changed

‎tests/clients/test_couchbase.py‎

Lines changed: 144 additions & 144 deletions
Large diffs are not rendered by default.

‎tests/clients/test_google-cloud-pubsub.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_publish(self):
4949
origin="instana")
5050
time.sleep(2.0) # for sanity
5151
result = future.result()
52-
assert isinstance(result, six.string_types)
52+
self.assertIsInstance(result, six.string_types)
5353

5454
spans = self.recorder.queued_spans()
5555
gcps_span, test_span = spans[0], spans[1]
@@ -76,7 +76,7 @@ def test_publish_as_root_exit_span(self):
7676
origin="instana")
7777
time.sleep(2.0) # for sanity
7878
result = future.result()
79-
assert isinstance(result, six.string_types)
79+
self.assertIsInstance(result, six.string_types)
8080

8181
spans = self.recorder.queued_spans()
8282
self.assertEqual(1, len(spans))

‎tests/frameworks/test_aiohttp_client.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ async def test():
7373
self.assertTrue(type(aiohttp_span.stack) is list)
7474
self.assertTrue(len(aiohttp_span.stack) > 1)
7575

76-
assert "X-INSTANA-T" in response.headers
76+
self.assertIn("X-INSTANA-T", response.headers)
7777
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
78-
assert "X-INSTANA-S" in response.headers
78+
self.assertIn("X-INSTANA-S", response.headers)
7979
self.assertEqual(response.headers["X-INSTANA-S"], wsgi_span.s)
80-
assert "X-INSTANA-L" in response.headers
80+
self.assertIn("X-INSTANA-L", response.headers)
8181
self.assertEqual(response.headers["X-INSTANA-L"], '1')
82-
assert "Server-Timing" in response.headers
82+
self.assertIn("Server-Timing", response.headers)
8383
self.assertEqual(
8484
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
8585

@@ -127,13 +127,13 @@ async def test():
127127
self.assertTrue(type(aiohttp_span.stack) is list)
128128
self.assertTrue(len(aiohttp_span.stack) > 1)
129129

130-
assert "X-INSTANA-T" in response.headers
130+
self.assertIn("X-INSTANA-T", response.headers)
131131
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
132-
assert "X-INSTANA-S" in response.headers
132+
self.assertIn("X-INSTANA-S", response.headers)
133133
self.assertEqual(response.headers["X-INSTANA-S"], wsgi_span2.s)
134-
assert "X-INSTANA-L" in response.headers
134+
self.assertIn("X-INSTANA-L", response.headers)
135135
self.assertEqual(response.headers["X-INSTANA-L"], '1')
136-
assert "Server-Timing" in response.headers
136+
self.assertIn("Server-Timing", response.headers)
137137
self.assertEqual(
138138
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
139139

@@ -177,13 +177,13 @@ async def test():
177177
self.assertTrue(type(aiohttp_span.stack) is list)
178178
self.assertTrue(len(aiohttp_span.stack) > 1)
179179

180-
assert "X-INSTANA-T" in response.headers
180+
self.assertIn("X-INSTANA-T", response.headers)
181181
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
182-
assert "X-INSTANA-S" in response.headers
182+
self.assertIn("X-INSTANA-S", response.headers)
183183
self.assertEqual(response.headers["X-INSTANA-S"], wsgi_span.s)
184-
assert "X-INSTANA-L" in response.headers
184+
self.assertIn("X-INSTANA-L", response.headers)
185185
self.assertEqual(response.headers["X-INSTANA-L"], '1')
186-
assert "Server-Timing" in response.headers
186+
self.assertIn("Server-Timing", response.headers)
187187
self.assertEqual(
188188
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
189189

@@ -229,13 +229,13 @@ async def test():
229229
self.assertTrue(type(aiohttp_span.stack) is list)
230230
self.assertTrue(len(aiohttp_span.stack) > 1)
231231

232-
assert "X-INSTANA-T" in response.headers
232+
self.assertIn("X-INSTANA-T", response.headers)
233233
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
234-
assert "X-INSTANA-S" in response.headers
234+
self.assertIn("X-INSTANA-S", response.headers)
235235
self.assertEqual(response.headers["X-INSTANA-S"], wsgi_span.s)
236-
assert "X-INSTANA-L" in response.headers
236+
self.assertIn("X-INSTANA-L", response.headers)
237237
self.assertEqual(response.headers["X-INSTANA-L"], '1')
238-
assert "Server-Timing" in response.headers
238+
self.assertIn("Server-Timing", response.headers)
239239
self.assertEqual(
240240
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
241241

@@ -280,13 +280,13 @@ async def test():
280280
self.assertTrue(type(aiohttp_span.stack) is list)
281281
self.assertTrue(len(aiohttp_span.stack) > 1)
282282

283-
assert "X-INSTANA-T" in response.headers
283+
self.assertIn("X-INSTANA-T", response.headers)
284284
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
285-
assert "X-INSTANA-S" in response.headers
285+
self.assertIn("X-INSTANA-S", response.headers)
286286
self.assertEqual(response.headers["X-INSTANA-S"], wsgi_span.s)
287-
assert "X-INSTANA-L" in response.headers
287+
self.assertIn("X-INSTANA-L", response.headers)
288288
self.assertEqual(response.headers["X-INSTANA-L"], '1')
289-
assert "Server-Timing" in response.headers
289+
self.assertIn("Server-Timing", response.headers)
290290
self.assertEqual(
291291
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
292292

@@ -332,13 +332,13 @@ async def test():
332332
self.assertTrue(type(aiohttp_span.stack) is list)
333333
self.assertTrue(len(aiohttp_span.stack) > 1)
334334

335-
assert "X-INSTANA-T" in response.headers
335+
self.assertIn("X-INSTANA-T", response.headers)
336336
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
337-
assert "X-INSTANA-S" in response.headers
337+
self.assertIn("X-INSTANA-S", response.headers)
338338
self.assertEqual(response.headers["X-INSTANA-S"], wsgi_span.s)
339-
assert "X-INSTANA-L" in response.headers
339+
self.assertIn("X-INSTANA-L", response.headers)
340340
self.assertEqual(response.headers["X-INSTANA-L"], '1')
341-
assert "Server-Timing" in response.headers
341+
self.assertIn("Server-Timing", response.headers)
342342
self.assertEqual(
343343
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
344344

@@ -384,16 +384,16 @@ async def test():
384384
self.assertTrue(type(aiohttp_span.stack) is list)
385385
self.assertTrue(len(aiohttp_span.stack) > 1)
386386

387-
assert "X-Capture-This" in aiohttp_span.data["http"]["header"]
387+
self.assertIn("X-Capture-This", aiohttp_span.data["http"]["header"])
388388
self.assertEqual("Ok", aiohttp_span.data["http"]["header"]["X-Capture-This"])
389389

390-
assert "X-INSTANA-T" in response.headers
390+
self.assertIn("X-INSTANA-T", response.headers)
391391
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
392-
assert "X-INSTANA-S" in response.headers
392+
self.assertIn("X-INSTANA-S", response.headers)
393393
self.assertEqual(response.headers["X-INSTANA-S"], wsgi_span.s)
394-
assert "X-INSTANA-L" in response.headers
394+
self.assertIn("X-INSTANA-L", response.headers)
395395
self.assertEqual(response.headers["X-INSTANA-L"], '1')
396-
assert "Server-Timing" in response.headers
396+
self.assertIn("Server-Timing", response.headers)
397397
self.assertEqual(response.headers["Server-Timing"], "intid;desc=%s" % traceId)
398398

399399
agent.options.extra_http_headers = original_extra_http_headers
@@ -435,7 +435,7 @@ async def test():
435435
aiohttp_span.data["http"]["url"])
436436
self.assertEqual("GET", aiohttp_span.data["http"]["method"])
437437
self.assertIsNotNone(aiohttp_span.data["http"]["error"])
438-
assert(len(aiohttp_span.data["http"]["error"]))
438+
self.assertTrue(len(aiohttp_span.data["http"]["error"]))
439439
self.assertIsNotNone(aiohttp_span.stack)
440440
self.assertTrue(type(aiohttp_span.stack) is list)
441441
self.assertTrue(len(aiohttp_span.stack) > 1)

‎tests/frameworks/test_aiohttp_server.py‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ async def test():
8484
self.assertTrue(type(aioclient_span.stack) is list)
8585
self.assertTrue(len(aioclient_span.stack) > 1)
8686

87-
assert "X-INSTANA-T" in response.headers
87+
self.assertIn("X-INSTANA-T", response.headers)
8888
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
89-
assert "X-INSTANA-S" in response.headers
89+
self.assertIn("X-INSTANA-S", response.headers)
9090
self.assertEqual(response.headers["X-INSTANA-S"], aioserver_span.s)
91-
assert "X-INSTANA-L" in response.headers
91+
self.assertIn("X-INSTANA-L", response.headers)
9292
self.assertEqual(response.headers["X-INSTANA-L"], '1')
93-
assert "Server-Timing" in response.headers
93+
self.assertIn("Server-Timing", response.headers)
9494
self.assertEqual(
9595
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
9696

@@ -146,13 +146,13 @@ async def test():
146146
self.assertTrue(isinstance(aioclient_span.stack, list))
147147
self.assertTrue(len(aioclient_span.stack) > 1)
148148

149-
assert "X-INSTANA-T" in response.headers
149+
self.assertIn("X-INSTANA-T", response.headers)
150150
self.assertEqual(response.headers["X-INSTANA-T"], trace_id)
151-
assert "X-INSTANA-S" in response.headers
151+
self.assertIn("X-INSTANA-S", response.headers)
152152
self.assertEqual(response.headers["X-INSTANA-S"], aioserver_span.s)
153-
assert "X-INSTANA-L" in response.headers
153+
self.assertIn("X-INSTANA-L", response.headers)
154154
self.assertEqual(response.headers["X-INSTANA-L"], '1')
155-
assert "Server-Timing" in response.headers
155+
self.assertIn("Server-Timing", response.headers)
156156
self.assertEqual(
157157
response.headers["Server-Timing"], "intid;desc=%s" % trace_id)
158158

@@ -230,13 +230,13 @@ async def test():
230230
self.assertTrue(type(aioclient_span.stack) is list)
231231
self.assertTrue(len(aioclient_span.stack) > 1)
232232

233-
assert "X-INSTANA-T" in response.headers
233+
self.assertIn("X-INSTANA-T", response.headers)
234234
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
235-
assert "X-INSTANA-S" in response.headers
235+
self.assertIn("X-INSTANA-S", response.headers)
236236
self.assertEqual(response.headers["X-INSTANA-S"], aioserver_span.s)
237-
assert "X-INSTANA-L" in response.headers
237+
self.assertIn("X-INSTANA-L", response.headers)
238238
self.assertEqual(response.headers["X-INSTANA-L"], '1')
239-
assert "Server-Timing" in response.headers
239+
self.assertIn("Server-Timing", response.headers)
240240
self.assertEqual(
241241
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
242242

@@ -299,19 +299,19 @@ async def test():
299299
self.assertTrue(type(aioclient_span.stack) is list)
300300
self.assertTrue(len(aioclient_span.stack) > 1)
301301

302-
assert "X-INSTANA-T" in response.headers
302+
self.assertIn("X-INSTANA-T", response.headers)
303303
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
304-
assert "X-INSTANA-S" in response.headers
304+
self.assertIn("X-INSTANA-S", response.headers)
305305
self.assertEqual(response.headers["X-INSTANA-S"], aioserver_span.s)
306-
assert "X-INSTANA-L" in response.headers
306+
self.assertIn("X-INSTANA-L", response.headers)
307307
self.assertEqual(response.headers["X-INSTANA-L"], '1')
308-
assert "Server-Timing" in response.headers
308+
self.assertIn("Server-Timing", response.headers)
309309
self.assertEqual(
310310
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
311311

312-
assert "X-Capture-This" in aioserver_span.data["http"]["header"]
312+
self.assertIn("X-Capture-This", aioserver_span.data["http"]["header"])
313313
self.assertEqual("this", aioserver_span.data["http"]["header"]["X-Capture-This"])
314-
assert "X-Capture-That" in aioserver_span.data["http"]["header"]
314+
self.assertIn("X-Capture-That", aioserver_span.data["http"]["header"])
315315
self.assertEqual("that", aioserver_span.data["http"]["header"]["X-Capture-That"])
316316

317317
def test_server_get_401(self):
@@ -361,13 +361,13 @@ async def test():
361361
self.assertTrue(type(aioclient_span.stack) is list)
362362
self.assertTrue(len(aioclient_span.stack) > 1)
363363

364-
assert "X-INSTANA-T" in response.headers
364+
self.assertIn("X-INSTANA-T", response.headers)
365365
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
366-
assert "X-INSTANA-S" in response.headers
366+
self.assertIn("X-INSTANA-S", response.headers)
367367
self.assertEqual(response.headers["X-INSTANA-S"], aioserver_span.s)
368-
assert "X-INSTANA-L" in response.headers
368+
self.assertIn("X-INSTANA-L", response.headers)
369369
self.assertEqual(response.headers["X-INSTANA-L"], '1')
370-
assert "Server-Timing" in response.headers
370+
self.assertIn("Server-Timing", response.headers)
371371
self.assertEqual(
372372
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
373373

@@ -420,13 +420,13 @@ async def test():
420420
self.assertTrue(type(aioclient_span.stack) is list)
421421
self.assertTrue(len(aioclient_span.stack) > 1)
422422

423-
assert "X-INSTANA-T" in response.headers
423+
self.assertIn("X-INSTANA-T", response.headers)
424424
self.assertEqual(response.headers["X-INSTANA-T"], traceId)
425-
assert "X-INSTANA-S" in response.headers
425+
self.assertIn("X-INSTANA-S", response.headers)
426426
self.assertEqual(response.headers["X-INSTANA-S"], aioserver_span.s)
427-
assert "X-INSTANA-L" in response.headers
427+
self.assertIn("X-INSTANA-L", response.headers)
428428
self.assertEqual(response.headers["X-INSTANA-L"], '1')
429-
assert "Server-Timing" in response.headers
429+
self.assertIn("Server-Timing", response.headers)
430430
self.assertEqual(
431431
response.headers["Server-Timing"], "intid;desc=%s" % traceId)
432432

‎tests/frameworks/test_grpcio.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ def test_unary_one_to_one(self):
6666
client_span = get_first_span_by_name(spans, 'rpc-client')
6767
test_span = get_first_span_by_name(spans, 'sdk')
6868

69-
assert(server_span)
70-
assert(client_span)
71-
assert(test_span)
69+
self.assertTrue(server_span)
70+
self.assertTrue(client_span)
71+
self.assertTrue(test_span)
7272

7373
# Same traceId
7474
self.assertEqual(server_span.t, client_span.t)
@@ -126,9 +126,9 @@ def test_streaming_many_to_one(self):
126126
client_span = get_first_span_by_name(spans, 'rpc-client')
127127
test_span = get_first_span_by_name(spans, 'sdk')
128128

129-
assert(server_span)
130-
assert(client_span)
131-
assert(test_span)
129+
self.assertTrue(server_span)
130+
self.assertTrue(client_span)
131+
self.assertTrue(test_span)
132132

133133
# Same traceId
134134
self.assertEqual(server_span.t, client_span.t)
@@ -189,9 +189,9 @@ def test_streaming_one_to_many(self):
189189
client_span = get_first_span_by_name(spans, 'rpc-client')
190190
test_span = get_first_span_by_name(spans, 'sdk')
191191

192-
assert(server_span)
193-
assert(client_span)
194-
assert(test_span)
192+
self.assertTrue(server_span)
193+
self.assertTrue(client_span)
194+
self.assertTrue(test_span)
195195

196196
# Same traceId
197197
self.assertEqual(server_span.t, client_span.t)
@@ -251,9 +251,9 @@ def test_streaming_many_to_many(self):
251251
client_span = get_first_span_by_name(spans, 'rpc-client')
252252
test_span = get_first_span_by_name(spans, 'sdk')
253253

254-
assert(server_span)
255-
assert(client_span)
256-
assert(test_span)
254+
self.assertTrue(server_span)
255+
self.assertTrue(client_span)
256+
self.assertTrue(test_span)
257257

258258
# Same traceId
259259
self.assertEqual(server_span.t, client_span.t)
@@ -309,9 +309,9 @@ def test_unary_one_to_one_with_call(self):
309309
client_span = get_first_span_by_name(spans, 'rpc-client')
310310
test_span = get_first_span_by_name(spans, 'sdk')
311311

312-
assert(server_span)
313-
assert(client_span)
314-
assert(test_span)
312+
self.assertTrue(server_span)
313+
self.assertTrue(client_span)
314+
self.assertTrue(test_span)
315315

316316
# Same traceId
317317
self.assertEqual(server_span.t, client_span.t)
@@ -368,9 +368,9 @@ def test_streaming_many_to_one_with_call(self):
368368
client_span = get_first_span_by_name(spans, 'rpc-client')
369369
test_span = get_first_span_by_name(spans, 'sdk')
370370

371-
assert(server_span)
372-
assert(client_span)
373-
assert(test_span)
371+
self.assertTrue(server_span)
372+
self.assertTrue(client_span)
373+
self.assertTrue(test_span)
374374

375375
# Same traceId
376376
self.assertEqual(server_span.t, client_span.t)
@@ -431,9 +431,9 @@ def process_response(future):
431431
client_span = get_first_span_by_name(spans, 'rpc-client')
432432
test_span = get_first_span_by_name(spans, 'sdk')
433433

434-
assert(server_span)
435-
assert(client_span)
436-
assert(test_span)
434+
self.assertTrue(server_span)
435+
self.assertTrue(client_span)
436+
self.assertTrue(test_span)
437437

438438
# Same traceId
439439
self.assertEqual(server_span.t, client_span.t)
@@ -496,9 +496,9 @@ def process_response(future):
496496
client_span = get_first_span_by_name(spans, 'rpc-client')
497497
test_span = get_first_span_by_name(spans, 'sdk')
498498

499-
assert(server_span)
500-
assert(client_span)
501-
assert(test_span)
499+
self.assertTrue(server_span)
500+
self.assertTrue(client_span)
501+
self.assertTrue(test_span)
502502

503503
# Same traceId
504504
self.assertEqual(server_span.t, client_span.t)
@@ -557,10 +557,10 @@ def test_server_error(self):
557557
client_span = get_first_span_by_name(spans, 'rpc-client')
558558
test_span = get_first_span_by_name(spans, 'sdk')
559559

560-
assert(log_span)
561-
assert(server_span)
562-
assert(client_span)
563-
assert(test_span)
560+
self.assertTrue(log_span)
561+
self.assertTrue(server_span)
562+
self.assertTrue(client_span)
563+
self.assertTrue(test_span)
564564

565565
# Same traceId
566566
self.assertEqual(server_span.t, client_span.t)

0 commit comments

Comments
 (0)