From 812fff62b16226ed320ac3070fc4add401043a7e Mon Sep 17 00:00:00 2001
From: Simone Basso <bassosimone@gmail.com>
Date: Wed, 19 Jun 2024 11:43:16 +0200
Subject: [PATCH] chore(oonimkall): log the events when testing
This diff, which is part of https://github.com/ooni/probe/issues/2752,
prints the event occurring when testing, which is useful for me to better
understand what is going on while changing the package.
Extracted from https://github.com/ooni/probe-cli/pull/1620.
---
pkg/oonimkall/taskrunner_test.go | 41 ++++++++++++++++----------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/pkg/oonimkall/taskrunner_test.go b/pkg/oonimkall/taskrunner_test.go
index 4d503f6f54..a2dff8d92f 100644
--- a/pkg/oonimkall/taskrunner_test.go
+++ b/pkg/oonimkall/taskrunner_test.go
@@ -173,9 +173,10 @@ func TestTaskRunnerRun(t *testing.T) {
// reduceEventsKeysIgnoreLog reduces the list of event keys
// counting equal subsequent keys and ignoring log events
- reduceEventsKeysIgnoreLog := func(events []*event) (out []eventKeyCount) {
+ reduceEventsKeysIgnoreLog := func(t *testing.T, events []*event) (out []eventKeyCount) {
var current eventKeyCount
for _, ev := range events {
+ t.Log(ev)
if ev.Key == eventTypeLog {
continue
}
@@ -303,7 +304,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -321,7 +322,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -339,7 +340,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -361,7 +362,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -382,7 +383,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -405,7 +406,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -427,7 +428,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -448,7 +449,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -469,7 +470,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -498,7 +499,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -531,7 +532,7 @@ func TestTaskRunnerRun(t *testing.T) {
"architecture": "arm64",
}
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -556,7 +557,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -604,7 +605,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -651,7 +652,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -681,7 +682,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -721,7 +722,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -766,7 +767,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollectContext(ctx, runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -796,7 +797,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},
@@ -830,7 +831,7 @@ func TestTaskRunnerRun(t *testing.T) {
}
runner.newSession = fake.NewSession
events := runAndCollect(runner, emitter)
- reduced := reduceEventsKeysIgnoreLog(events)
+ reduced := reduceEventsKeysIgnoreLog(t, events)
expect := []eventKeyCount{
{Key: eventTypeStatusQueued, Count: 1},
{Key: eventTypeStatusStarted, Count: 1},