Activate ruff rule PT018 on tests folder (#4049)

Author: cbeauchesne

pyproject.toml

@@ -194,7 +194,6 @@ ignore = [
     "D200",      # 52 occurences    [*] fits-on-one-line
     "F405",      # 43 occurences    [ ] undefined-local-with-import-star-usage
     "TRY002",    # 41 occurences    [ ] raise-vanilla-class
-    "PT018",     # 39 occurences    [ ] pytest-composite-assertion
     "N802",      # 39 occurences    [ ] invalid-function-name
     "FBT002",    # 30 occurences    [ ] boolean-default-value-positional-argument
     "D404",      # 25 occurences    [ ] docstring-starts-with-this

tests/apm_tracing_e2e/test_single_span.py

@@ -74,9 +74,8 @@ def _assert_single_span_event(event, name, is_root):
     if is_root:
         assert parent_id == "0"
     else:
-        assert (
-            parent_id != "0" and len(parent_id) > 0
-        ), f"In a child span the parent_id should be specified. Actual: {parent_id}"
+        assert parent_id != "0", f"In a child span the parent_id should be specified. Actual: {parent_id}"
+        assert len(parent_id) > 0, f"In a child span the parent_id should be specified. Actual: {parent_id}"
 
 
 def _assert_single_span_metrics(span):

tests/appsec/iast/utils.py

@@ -236,7 +236,8 @@ def validate_stack_traces(request):
 
     # Vulns without location path are not expected to have a stack trace
     location = vuln["location"]
-    assert location is not None and "path" in location, "This vulnerability is not expected to have a stack trace"
+    assert location is not None, "This vulnerability is not expected to have a stack trace"
+    assert "path" in location, "This vulnerability is not expected to have a stack trace"
 
     locationFrame = None
     for frame in stack_trace["frames"]:
@@ -263,7 +264,8 @@ def validate_extended_location_data(request, vulnerability_type, is_expected_loc
     span = spans[0]
 
     iast = span.get("meta", {}).get("_dd.iast.json")
-    assert iast and iast["vulnerabilities"], "Expected at least one vulnerability"
+    assert iast, "Expected at least one vulnerability"
+    assert iast["vulnerabilities"], "Expected at least one vulnerability"
 
     # Filter by vulnerability
     if vulnerability_type:
@@ -553,4 +555,5 @@ def test_cookie_name_filter(self):
         assert_iast_vulnerability(request=self.req2, vulnerability_count=1, vulnerability_type=self.vulnerability_type)
 
         meta, meta_struct = _get_span_meta(self.req3)
-        assert "_dd.iast.json" not in meta and "iast" not in meta_struct, "No IAST info expected in span"
+        assert "_dd.iast.json" not in meta, "No IAST info expected in span"
+        assert "iast" not in meta_struct, "No IAST info expected in span"

tests/integrations/test_dbm.py

@@ -156,7 +156,8 @@ def test_dbm_comment(self):
 
         expected_dbm_comment = f"/*dddb='{self.dddb}',dddbs='{self.dddbs}',dde='{self.dde}',ddh='{self.ddh}',ddps='{self.ddps}',ddpv='{self.ddpv}'*/ SELECT version()"
 
-        assert "status" in data and data["status"] == "ok"
+        assert "status" in data
+        assert data["status"] == "ok"
         assert "traceparent" in data["dbm_comment"]
         assert remove_traceparent(data["dbm_comment"]) == expected_dbm_comment
 

tests/k8s_lib_injection/test_k8s_init_image_validator.py

@@ -14,7 +14,8 @@ def _get_dev_agent_traces(self):
         logger.info("[Check traces] Checking traces:")
         response = requests.get("http://localhost:8126/test/traces")
         traces_json = response.json()
-        assert traces_json is not None and len(traces_json) > 0, "No traces found"
+        assert traces_json is not None, "No traces found"
+        assert len(traces_json) > 0, "No traces found"
         return traces_json
 
     @retry(delay=5, tries=20)

tests/otel/test_context_propagation.py

@@ -24,7 +24,8 @@ def test_propagation_extract(self):
 
         assert content["trace_id"] == 2
         assert content["span_id"] == 10
-        assert content["tracestate"] and not content["tracestate"].isspace()
+        assert content["tracestate"]
+        assert not content["tracestate"].isspace()
         # assert content["baggage"] and not content["baggage"].isspace()
 
     def setup_propagation_inject(self):
@@ -34,5 +35,6 @@ def setup_propagation_inject(self):
     def test_propagation_inject(self):
         content = json.loads(self.r.text)
 
-        assert content["traceparent"] and not content["traceparent"].isspace()
+        assert content["traceparent"]
+        assert not content["traceparent"].isspace()
         # assert content["baggage"] and not content["baggage"].isspace()

tests/parametric/test_crashtracking.py

@@ -59,7 +59,8 @@ def assert_crash_report(self, test_library, event):
         # Most client libraries are using libdatadog so tesing signum tag would work,
         # but Java isn't so we end up with testing for severity tag.
         if test_library.lang == "java":
-            assert "severity" in tags_dict and tags_dict["severity"] == "crash", tags_dict
+            assert "severity" in tags_dict, tags_dict
+            assert tags_dict["severity"] == "crash", tags_dict
         else:
             # According to the RFC, si_signo should be set to 11 for SIGSEGV
             assert "signum" in tags_dict or ("si_signo" in tags_dict and tags_dict["si_signo"] == "11"), tags_dict

tests/parametric/test_headers_b3.py

@@ -95,7 +95,8 @@ def test_headers_b3_inject_valid(self, test_agent, test_library):
 
         assert len(b3_trace_id) == 16 or len(b3_trace_id) == 32
         assert int(b3_trace_id[-16:], base=16) == span.get("trace_id")
-        assert int(b3_span_id, base=16) == span.get("span_id") and len(b3_span_id) == 16
+        assert int(b3_span_id, base=16) == span.get("span_id")
+        assert len(b3_span_id) == 16
         assert b3_sampling == "1" if span["metrics"].get(SAMPLING_PRIORITY_KEY) > 0 else "0"
         assert span["meta"].get(ORIGIN) is None
 
@@ -120,7 +121,8 @@ def test_headers_b3_propagate_valid(self, test_agent, test_library):
 
         assert len(b3_trace_id) == 16 or len(b3_trace_id) == 32
         assert int(b3_trace_id, base=16) == span.get("trace_id")
-        assert int(b3_span_id, base=16) == span.get("span_id") and len(b3_span_id) == 16
+        assert int(b3_span_id, base=16) == span.get("span_id")
+        assert len(b3_span_id) == 16
         assert b3_sampling == "1"
         assert span["meta"].get(ORIGIN) is None
 
@@ -146,7 +148,8 @@ def test_headers_b3_propagate_invalid(self, test_agent, test_library):
 
         assert len(b3_trace_id) == 16 or len(b3_trace_id) == 32
         assert int(b3_trace_id[-16:], base=16) == span.get("trace_id")
-        assert int(b3_span_id, base=16) == span.get("span_id") and len(b3_span_id) == 16
+        assert int(b3_span_id, base=16) == span.get("span_id")
+        assert len(b3_span_id) == 16
         assert b3_sampling == "1" if span["metrics"].get(SAMPLING_PRIORITY_KEY) > 0 else "0"
         assert span["meta"].get(ORIGIN) is None
 

tests/parametric/test_headers_b3multi.py

@@ -85,7 +85,8 @@ def test_headers_b3multi_inject_valid(self, test_agent, test_library):
 
         assert len(b3_trace_id) == 16 or len(b3_trace_id) == 32
         assert int(b3_trace_id[-16:], base=16) == span.get("trace_id")
-        assert int(b3_span_id, base=16) == span.get("span_id") and len(b3_span_id) == 16
+        assert int(b3_span_id, base=16) == span.get("span_id")
+        assert len(b3_span_id) == 16
         assert b3_sampling == "1" if span["metrics"].get(SAMPLING_PRIORITY_KEY) > 0 else "0"
         assert span["meta"].get(ORIGIN) is None
 
@@ -111,7 +112,8 @@ def test_headers_b3multi_propagate_valid(self, test_agent, test_library):
 
         assert len(b3_trace_id) == 16 or len(b3_trace_id) == 32
         assert int(b3_trace_id, base=16) == span.get("trace_id")
-        assert int(b3_span_id, base=16) == span.get("span_id") and len(b3_span_id) == 16
+        assert int(b3_span_id, base=16) == span.get("span_id")
+        assert len(b3_span_id) == 16
         assert b3_sampling == "1"
         assert span["meta"].get(ORIGIN) is None
 
@@ -135,7 +137,8 @@ def test_headers_b3multi_propagate_invalid(self, test_agent, test_library):
 
         assert len(b3_trace_id) == 16 or len(b3_trace_id) == 32
         assert int(b3_trace_id[-16:], base=16) == span.get("trace_id")
-        assert int(b3_span_id, base=16) == span.get("span_id") and len(b3_span_id) == 16
+        assert int(b3_span_id, base=16) == span.get("span_id")
+        assert len(b3_span_id) == 16
         assert b3_sampling == "1" if span["metrics"].get(SAMPLING_PRIORITY_KEY) > 0 else "0"
         assert span["meta"].get(ORIGIN) is None
 

tests/parametric/test_headers_precedence.py

@@ -283,7 +283,8 @@ def test_headers_precedence_propagationstyle_tracecontext_datadog(self, test_age
         assert int(traceparent1.trace_id[-16:], base=16) == int(headers1["x-datadog-trace-id"])
         assert int(traceparent1.parent_id, base=16) == int(headers1["x-datadog-parent-id"])
         assert "tracestate" in headers1
-        assert len(tracestate1Arr) == 1 and tracestate1Arr[0].startswith("dd=")
+        assert len(tracestate1Arr) == 1
+        assert tracestate1Arr[0].startswith("dd=")
 
         # 2) Only tracecontext headers
         # Result: traceparent used
@@ -293,7 +294,8 @@ def test_headers_precedence_propagationstyle_tracecontext_datadog(self, test_age
         assert traceparent2.trace_id == "12345678901234567890123456789012"
         assert traceparent2.parent_id != "1234567890123456"
         assert "tracestate" in headers2
-        assert len(tracestate2Arr) == 1 and tracestate2Arr[0].startswith("dd=")
+        assert len(tracestate2Arr) == 1
+        assert tracestate2Arr[0].startswith("dd=")
 
         # Datadog also injected, assert that they are equal to traceparent values
         assert int(headers2["x-datadog-trace-id"]) == int(traceparent2.trace_id[16:], base=16)
@@ -308,7 +310,9 @@ def test_headers_precedence_propagationstyle_tracecontext_datadog(self, test_age
         assert traceparent3.trace_id == "12345678901234567890123456789012"
         assert traceparent3.parent_id != "1234567890123456"
         assert "tracestate" in headers3
-        assert len(tracestate3Arr) == 2 and tracestate3Arr[0].startswith("dd=") and tracestate3Arr[1] == "foo=1"
+        assert len(tracestate3Arr) == 2
+        assert tracestate3Arr[0].startswith("dd=")
+        assert tracestate3Arr[1] == "foo=1"
 
         # Datadog also injected, assert that they are equal to traceparent values
         assert int(headers3["x-datadog-trace-id"]) == int(traceparent3.trace_id[16:], base=16)
@@ -323,7 +327,9 @@ def test_headers_precedence_propagationstyle_tracecontext_datadog(self, test_age
         assert traceparent4.trace_id == "12345678901234567890123456789012"
         assert traceparent4.parent_id != "1234567890123456"
         assert "tracestate" in headers4
-        assert len(tracestate4Arr) == 2 and tracestate4Arr[0].startswith("dd=") and tracestate4Arr[1] == "foo=1"
+        assert len(tracestate4Arr) == 2
+        assert tracestate4Arr[0].startswith("dd=")
+        assert tracestate4Arr[1] == "foo=1"
 
         # Datadog also injected, assert that they are equal to traceparent values
         assert int(headers4["x-datadog-trace-id"]) == int(traceparent4.trace_id[16:], base=16)
@@ -343,7 +349,8 @@ def test_headers_precedence_propagationstyle_tracecontext_datadog(self, test_age
         assert int(traceparent5.trace_id, base=16) == int(headers5["x-datadog-trace-id"])
         assert int(traceparent5.parent_id, base=16) == int(headers5["x-datadog-parent-id"])
         assert "tracestate" in headers5
-        assert len(tracestate5Arr) == 1 and tracestate5Arr[0].startswith("dd=")
+        assert len(tracestate5Arr) == 1
+        assert tracestate5Arr[0].startswith("dd=")
 
         # 6) Invalid tracecontext, valid Datadog headers
         # Result: Datadog used
@@ -358,7 +365,8 @@ def test_headers_precedence_propagationstyle_tracecontext_datadog(self, test_age
         assert int(traceparent6.trace_id, base=16) == int(headers6["x-datadog-trace-id"])
         assert int(traceparent6.parent_id, base=16) == int(headers6["x-datadog-parent-id"])
         assert "tracestate" in headers6
-        assert len(tracestate6Arr) == 1 and tracestate6Arr[0].startswith("dd=")
+        assert len(tracestate6Arr) == 1
+        assert tracestate6Arr[0].startswith("dd=")
 
     @enable_tracecontext()
     def test_headers_precedence_propagationstyle_tracecontext(self, test_agent, test_library):
@@ -412,7 +420,8 @@ def test_headers_precedence_propagationstyle_tracecontext(self, test_agent, test
         tracestate1Arr = headers1["tracestate"].split(",")
         assert "traceparent" in headers1
         assert "tracestate" in headers1
-        assert len(tracestate1Arr) == 1 and tracestate1Arr[0].startswith("dd=")
+        assert len(tracestate1Arr) == 1
+        assert tracestate1Arr[0].startswith("dd=")
         assert "x-datadog-trace-id" not in headers1
         assert "x-datadog-parent-id" not in headers1
         assert "x-datadog-sampling-priority" not in headers1
@@ -425,7 +434,8 @@ def test_headers_precedence_propagationstyle_tracecontext(self, test_agent, test
         assert traceparent2.trace_id == "12345678901234567890123456789012"
         assert traceparent2.parent_id != "1234567890123456"
         assert "tracestate" in headers2
-        assert len(tracestate2Arr) == 1 and tracestate2Arr[0].startswith("dd=")
+        assert len(tracestate2Arr)
+        assert tracestate2Arr[0].startswith("dd=")
         assert "x-datadog-trace-id" not in headers2
         assert "x-datadog-parent-id" not in headers2
         assert "x-datadog-sampling-priority" not in headers2
@@ -438,7 +448,9 @@ def test_headers_precedence_propagationstyle_tracecontext(self, test_agent, test
         assert traceparent3.trace_id == "12345678901234567890123456789012"
         assert traceparent3.parent_id != "1234567890123456"
         assert "tracestate" in headers3
-        assert len(tracestate3Arr) == 2 and tracestate3Arr[0].startswith("dd=") and tracestate3Arr[1] == "foo=1"
+        assert len(tracestate3Arr) == 2
+        assert tracestate3Arr[0].startswith("dd=")
+        assert tracestate3Arr[1] == "foo=1"
         assert "x-datadog-trace-id" not in headers3
         assert "x-datadog-parent-id" not in headers3
         assert "x-datadog-sampling-priority" not in headers3
@@ -451,7 +463,9 @@ def test_headers_precedence_propagationstyle_tracecontext(self, test_agent, test
         assert traceparent4.trace_id == "12345678901234567890123456789012"
         assert traceparent4.parent_id != "1234567890123456"
         assert "tracestate" in headers4
-        assert len(tracestate4Arr) == 2 and tracestate4Arr[0].startswith("dd=") and tracestate4Arr[1] == "foo=1"
+        assert len(tracestate4Arr) == 2
+        assert tracestate4Arr[0].startswith("dd=")
+        assert tracestate4Arr[1] == "foo=1"
         assert "x-datadog-trace-id" not in headers4
         assert "x-datadog-parent-id" not in headers4
         assert "x-datadog-sampling-priority" not in headers4
@@ -461,7 +475,8 @@ def test_headers_precedence_propagationstyle_tracecontext(self, test_agent, test
         tracestate5Arr = headers5["tracestate"].split(",")
         assert "traceparent" in headers5
         assert "tracestate" in headers5
-        assert len(tracestate5Arr) == 1 and tracestate5Arr[0].startswith("dd=")
+        assert len(tracestate5Arr) == 1
+        assert tracestate5Arr[0].startswith("dd=")
         assert "x-datadog-trace-id" not in headers5
         assert "x-datadog-parent-id" not in headers5
         assert "x-datadog-sampling-priority" not in headers5
@@ -471,7 +486,8 @@ def test_headers_precedence_propagationstyle_tracecontext(self, test_agent, test
         tracestate6Arr = headers6["tracestate"].split(",")
         assert "traceparent" in headers6
         assert "tracestate" in headers6
-        assert len(tracestate6Arr) == 1 and tracestate6Arr[0].startswith("dd=")
+        assert len(tracestate6Arr) == 1
+        assert tracestate6Arr[0].startswith("dd=")
         assert "x-datadog-trace-id" not in headers6
         assert "x-datadog-parent-id" not in headers6
         assert "x-datadog-sampling-priority" not in headers6
@@ -547,7 +563,8 @@ def test_headers_precedence_propagationstyle_datadog_tracecontext(self, test_age
         assert int(traceparent1.trace_id[-16:], base=16) == int(headers1["x-datadog-trace-id"])
         assert int(traceparent1.parent_id, base=16) == int(headers1["x-datadog-parent-id"])
         assert "tracestate" in headers1
-        assert len(tracestate1Arr) == 1 and tracestate1Arr[0].startswith("dd=")
+        assert len(tracestate1Arr) == 1
+        assert tracestate1Arr[0].startswith("dd=")
 
         # 2) Only tracecontext headers
         # Result: traceparent used
@@ -557,7 +574,8 @@ def test_headers_precedence_propagationstyle_datadog_tracecontext(self, test_age
         assert traceparent2.trace_id == "12345678901234567890123456789012"
         assert traceparent2.parent_id != "1234567890123456"
         assert "tracestate" in headers2
-        assert len(tracestate2Arr) == 1 and tracestate2Arr[0].startswith("dd=")
+        assert len(tracestate2Arr) == 1
+        assert tracestate2Arr[0].startswith("dd=")
 
         # Datadog also injected, assert that they are equal to traceparent values
         assert int(headers2["x-datadog-trace-id"]) == int(traceparent2.trace_id[16:], base=16)
@@ -572,7 +590,9 @@ def test_headers_precedence_propagationstyle_datadog_tracecontext(self, test_age
         assert traceparent3.trace_id == "12345678901234567890123456789012"
         assert traceparent3.parent_id != "1234567890123456"
         assert "tracestate" in headers3
-        assert len(tracestate3Arr) == 2 and tracestate3Arr[0].startswith("dd=") and tracestate3Arr[1] == "foo=1"
+        assert len(tracestate3Arr) == 2
+        assert tracestate3Arr[0].startswith("dd=")
+        assert tracestate3Arr[1] == "foo=1"
 
         # Datadog also injected, assert that they are equal to traceparent values
         assert int(headers3["x-datadog-trace-id"]) == int(traceparent3.trace_id[16:], base=16)
@@ -592,7 +612,8 @@ def test_headers_precedence_propagationstyle_datadog_tracecontext(self, test_age
         assert int(traceparent4.trace_id, base=16) == int(headers4["x-datadog-trace-id"])
         assert int(traceparent4.parent_id, base=16) == int(headers4["x-datadog-parent-id"])
         assert "tracestate" in headers4
-        assert len(tracestate4Arr) == 1 and tracestate4Arr[0].startswith("dd=")
+        assert len(tracestate4Arr) == 1
+        assert tracestate4Arr[0].startswith("dd=")
 
         # 5) Only Datadog headers
         # Result: Datadog used
@@ -607,7 +628,8 @@ def test_headers_precedence_propagationstyle_datadog_tracecontext(self, test_age
         assert int(traceparent5.trace_id, base=16) == int(headers5["x-datadog-trace-id"])
         assert int(traceparent5.parent_id, base=16) == int(headers5["x-datadog-parent-id"])
         assert "tracestate" in headers5
-        assert len(tracestate5Arr) == 1 and tracestate5Arr[0].startswith("dd=")
+        assert len(tracestate5Arr) == 1
+        assert tracestate5Arr[0].startswith("dd=")
 
         # 6) Invalid tracecontext, valid Datadog headers
         # Result: Datadog used
@@ -622,7 +644,8 @@ def test_headers_precedence_propagationstyle_datadog_tracecontext(self, test_age
         assert int(traceparent6.trace_id, base=16) == int(headers6["x-datadog-trace-id"])
         assert int(traceparent6.parent_id, base=16) == int(headers6["x-datadog-parent-id"])
         assert "tracestate" in headers6
-        assert len(tracestate6Arr) == 1 and tracestate6Arr[0].startswith("dd=")
+        assert len(tracestate6Arr) == 1
+        assert tracestate6Arr[0].startswith("dd=")
 
     @enable_datadog_b3multi_tracecontext_extract_first_false()
     @missing_feature(context.library < "[email protected]", reason="Implemented in 0.1.12")