diff --git a/end2end/django_mysql_test.py b/end2end/django_mysql_test.py index 0520da672..db6060195 100644 --- a/end2end/django_mysql_test.py +++ b/end2end/django_mysql_test.py @@ -88,5 +88,6 @@ def test_initial_heartbeat(): "method": "POST", "path": "/app/create" }], - {"aborted":0,"attacksDetected":{"blocked":2,"total":2},"total":3} + {"aborted":0,"attacksDetected":{"blocked":2,"total":2},"total":3}, + {'asgiref', 'regex', 'mysqlclient', 'sqlparse', 'aikido_zen', 'django'} ) diff --git a/end2end/server/check_events_from_mock.py b/end2end/server/check_events_from_mock.py index 8da473f3a..d648c47ce 100644 --- a/end2end/server/check_events_from_mock.py +++ b/end2end/server/check_events_from_mock.py @@ -21,8 +21,13 @@ def validate_started_event(event, stack, dry_mode=False, serverless=False, os_na # if stack is not None: # assert set(event["agent"]["stack"]) == set(stack) -def validate_heartbeat(event, routes, req_stats): +def validate_heartbeat(event, routes=None, req_stats=None, packages=None): assert event["type"] == "heartbeat", f"Expected event type 'heartbeat', but got '{event['type']}'" - assert event["routes"] == routes, f"Expected routes '{routes}', but got '{event['routes']}'" - assert event["stats"]["requests"] == req_stats, f"Expected request stats '{req_stats}', but got '{event['stats']['requests']}'" + if packages: + package_names = set(map(lambda x: x["name"], event["packages"])) + assert package_names == packages, f"Expected {packages} but got {package_names}" + if routes: + assert event["routes"] == routes, f"Expected routes '{routes}', but got '{event['routes']}'" + if req_stats: + assert event["stats"]["requests"] == req_stats, f"Expected request stats '{req_stats}', but got '{event['stats']['requests']}'"