Skip to content

Commit e83f3f8

Browse files
committed
test: changed categorization test to include backslash-metacharacter (\w)
1 parent c38b814 commit e83f3f8

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

tests/test_query2.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -516,32 +516,32 @@ def test_query2_query_categorize(datastore):
516516
starttime = iso8601.parse_date("1970")
517517
endtime = starttime + timedelta(hours=1)
518518

519-
example_query = """
519+
example_query = r"""
520520
events = query_bucket("{bid}");
521521
events = sort_by_timestamp(events);
522-
events = categorize(events, [[["test"], {{"regex": "test"}}], [["test", "subtest"], {{"regex": "test2"}}]]);
522+
events = categorize(events, [[["test"], {{"regex": "test"}}], [["test", "subtest"], {{"regex": "test\w"}}]]);
523523
events_by_cat = merge_events_by_keys(events, ["$category"]);
524524
RETURN = {{"events": events, "events_by_cat": events_by_cat}};
525525
""".format(
526-
bid=bid, bid_escaped=bid.replace("'", "\\'")
526+
bid=bid
527527
)
528528
try:
529529
bucket = datastore.create_bucket(
530530
bucket_id=bid, type="test", client="test", hostname="test", name="asd"
531531
)
532532
events = [
533533
Event(
534-
data={"label": "test1"},
534+
data={"label": "test"},
535535
timestamp=starttime,
536536
duration=timedelta(seconds=1),
537537
),
538538
Event(
539-
data={"label": "test2"},
539+
data={"label": "testwithmoredetail"},
540540
timestamp=starttime + timedelta(seconds=1),
541541
duration=timedelta(seconds=1),
542542
),
543543
Event(
544-
data={"label": "test2"},
544+
data={"label": "testwithmoredetail"},
545545
timestamp=starttime + timedelta(seconds=2),
546546
duration=timedelta(seconds=1),
547547
),
@@ -550,9 +550,11 @@ def test_query2_query_categorize(datastore):
550550
result = query(qname, example_query, starttime, endtime, datastore)
551551
print(result)
552552
assert len(result["events"]) == 3
553-
assert result["events"][0].data["label"] == "test1"
553+
assert result["events"][0].data["label"] == "test"
554554
assert result["events"][0].data["$category"] == ["test"]
555555
assert result["events"][1].data["$category"] == ["test", "subtest"]
556+
557+
assert len(result["events_by_cat"]) == 2
556558
assert result["events_by_cat"][0].data["$category"] == ["test"]
557559
assert result["events_by_cat"][1].data["$category"] == ["test", "subtest"]
558560
assert result["events_by_cat"][1].duration == timedelta(seconds=2)

0 commit comments

Comments
 (0)