Skip to content

Commit 770b298

Browse files
GSVarshaCagriYonca
GSVarsha
authored and
CagriYonca
committed
fix: tornado tests
- `in` fails while `get()` works—the latter normalizes the input before lookup. Signed-off-by: Varsha GS <varsha.gs@ibm.com>
1 parent 90c4669 commit 770b298

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎tests/frameworks/test_tornado_client.py‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ async def test():
8383
assert type(client_span.stack) is list
8484
assert len(client_span.stack) > 1
8585

86-
assert "X-INSTANA-T" in response.headers
86+
assert response.headers.get("X-INSTANA-T")
8787
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
88-
assert "X-INSTANA-S" in response.headers
88+
assert response.headers.get("X-INSTANA-S")
8989
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
90-
assert "X-INSTANA-L" in response.headers
90+
assert response.headers.get("X-INSTANA-L")
9191
assert response.headers["X-INSTANA-L"] == "1"
92-
assert "Server-Timing" in response.headers
92+
assert response.headers.get("Server-Timing")
9393
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
9494

9595
def test_post(self) -> None:
@@ -140,13 +140,13 @@ async def test():
140140
assert type(client_span.stack) is list
141141
assert len(client_span.stack) > 1
142142

143-
assert "X-INSTANA-T" in response.headers
143+
assert response.headers.get("X-INSTANA-T")
144144
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
145-
assert "X-INSTANA-S" in response.headers
145+
assert response.headers.get("X-INSTANA-S")
146146
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
147-
assert "X-INSTANA-L" in response.headers
147+
assert response.headers.get("X-INSTANA-L")
148148
assert response.headers["X-INSTANA-L"] == "1"
149-
assert "Server-Timing" in response.headers
149+
assert response.headers.get("Server-Timing")
150150
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
151151

152152
def test_get_301(self) -> None:
@@ -242,13 +242,13 @@ def filter(span):
242242
assert type(client301_span.stack) is list
243243
assert len(client301_span.stack) > 1
244244

245-
assert "X-INSTANA-T" in response.headers
245+
assert response.headers.get("X-INSTANA-T")
246246
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
247-
assert "X-INSTANA-S" in response.headers
247+
assert response.headers.get("X-INSTANA-S")
248248
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
249-
assert "X-INSTANA-L" in response.headers
249+
assert response.headers.get("X-INSTANA-L")
250250
assert response.headers["X-INSTANA-L"] == "1"
251-
assert "Server-Timing" in response.headers
251+
assert response.headers.get("Server-Timing")
252252
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
253253

254254
def test_get_405(self) -> None:
@@ -302,13 +302,13 @@ async def test():
302302
assert type(client_span.stack) is list
303303
assert len(client_span.stack) > 1
304304

305-
assert "X-INSTANA-T" in response.headers
305+
assert response.headers.get("X-INSTANA-T")
306306
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
307-
assert "X-INSTANA-S" in response.headers
307+
assert response.headers.get("X-INSTANA-S")
308308
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
309-
assert "X-INSTANA-L" in response.headers
309+
assert response.headers.get("X-INSTANA-L")
310310
assert response.headers["X-INSTANA-L"] == "1"
311-
assert "Server-Timing" in response.headers
311+
assert response.headers.get("Server-Timing")
312312
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
313313

314314
def test_get_500(self) -> None:
@@ -362,13 +362,13 @@ async def test():
362362
assert type(client_span.stack) is list
363363
assert len(client_span.stack) > 1
364364

365-
assert "X-INSTANA-T" in response.headers
365+
assert response.headers.get("X-INSTANA-T")
366366
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
367-
assert "X-INSTANA-S" in response.headers
367+
assert response.headers.get("X-INSTANA-S")
368368
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
369-
assert "X-INSTANA-L" in response.headers
369+
assert response.headers.get("X-INSTANA-L")
370370
assert response.headers["X-INSTANA-L"] == "1"
371-
assert "Server-Timing" in response.headers
371+
assert response.headers.get("Server-Timing")
372372
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
373373

374374
def test_get_504(self) -> None:
@@ -422,13 +422,13 @@ async def test():
422422
assert type(client_span.stack) is list
423423
assert len(client_span.stack) > 1
424424

425-
assert "X-INSTANA-T" in response.headers
425+
assert response.headers.get("X-INSTANA-T")
426426
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
427-
assert "X-INSTANA-S" in response.headers
427+
assert response.headers.get("X-INSTANA-S")
428428
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
429-
assert "X-INSTANA-L" in response.headers
429+
assert response.headers.get("X-INSTANA-L")
430430
assert response.headers["X-INSTANA-L"] == "1"
431-
assert "Server-Timing" in response.headers
431+
assert response.headers.get("Server-Timing")
432432
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
433433

434434
def test_get_with_params_to_scrub(self) -> None:
@@ -480,13 +480,13 @@ async def test():
480480
assert type(client_span.stack) is list
481481
assert len(client_span.stack) > 1
482482

483-
assert "X-INSTANA-T" in response.headers
483+
assert response.headers.get("X-INSTANA-T")
484484
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
485-
assert "X-INSTANA-S" in response.headers
485+
assert response.headers.get("X-INSTANA-S")
486486
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
487-
assert "X-INSTANA-L" in response.headers
487+
assert response.headers.get("X-INSTANA-L")
488488
assert response.headers["X-INSTANA-L"] == "1"
489-
assert "Server-Timing" in response.headers
489+
assert response.headers.get("Server-Timing")
490490
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
491491

492492
def test_request_header_capture(self) -> None:
@@ -547,13 +547,13 @@ async def test():
547547
assert type(client_span.stack) is list
548548
assert len(client_span.stack) > 1
549549

550-
assert "X-INSTANA-T" in response.headers
550+
assert response.headers.get("X-INSTANA-T")
551551
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
552-
assert "X-INSTANA-S" in response.headers
552+
assert response.headers.get("X-INSTANA-S")
553553
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
554-
assert "X-INSTANA-L" in response.headers
554+
assert response.headers.get("X-INSTANA-L")
555555
assert response.headers["X-INSTANA-L"] == "1"
556-
assert "Server-Timing" in response.headers
556+
assert response.headers.get("Server-Timing")
557557
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
558558

559559
assert "X-Capture-This" in client_span.data["http"]["header"]
@@ -622,13 +622,13 @@ async def test():
622622
assert type(client_span.stack) is list
623623
assert len(client_span.stack) > 1
624624

625-
assert "X-INSTANA-T" in response.headers
625+
assert response.headers.get("X-INSTANA-T")
626626
assert response.headers["X-INSTANA-T"] == hex_id(traceId)
627-
assert "X-INSTANA-S" in response.headers
627+
assert response.headers.get("X-INSTANA-S")
628628
assert response.headers["X-INSTANA-S"] == hex_id(server_span.s)
629-
assert "X-INSTANA-L" in response.headers
629+
assert response.headers.get("X-INSTANA-L")
630630
assert response.headers["X-INSTANA-L"] == "1"
631-
assert "Server-Timing" in response.headers
631+
assert response.headers.get("Server-Timing")
632632
assert response.headers["Server-Timing"] == f"intid;desc={hex_id(traceId)}"
633633

634634
assert "X-Capture-This-Too" in client_span.data["http"]["header"]

0 commit comments

Comments
 (0)