Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup(pkg/oonimkall): simplify test code #1619

Merged
merged 22 commits into from
Jun 7, 2024
Merged

cleanup(pkg/oonimkall): simplify test code #1619

merged 22 commits into from
Jun 7, 2024

Conversation

bassosimone
Copy link
Contributor

@bassosimone bassosimone commented Jun 7, 2024

This diff simplifies test code in pkg/oonimkall in preparation for further richer-input related changes.

Part of ooni/probe#2607.

While there (a) realize we don't need anymore to init the example experiment name in its factory constructor, so normalize its construction to be equal to all the other experiments; (b) realize that the TestTaskRunnerRun does not require the network and is ~short, so there's no point to skip it when in short mode; (c) avoid using the deprecated legacy/mockable package and instead use the mocks package.

This diff completes the set of preliminary richer input diffs.

We build the TargetLoader using the ExperimentBuilder, which in turn
uses a registry.Factory under the hood.

This means that we can load targets for each experiment.

Part of ooni/probe#2607
Conflicts:
	internal/oonirun/experiment.go
	internal/registry/dnscheck.go
	internal/targetloading/targetloading.go
This diff simplifies test code in pkg/oonimkall in preparation
for further richer-input related changes.

Part of ooni/probe#2607
Conflicts:
	internal/reflectx/reflectx.go
	internal/reflectx/reflectx_test.go
	internal/registry/factory_test.go
@bassosimone bassosimone marked this pull request as ready for review June 7, 2024 07:21
Copy link
Contributor

@DecFox DecFox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes look good. As we discussed, I left a remark for changing a file name.

pkg/oonimkall/taskmocks_test.go Outdated Show resolved Hide resolved
@bassosimone bassosimone merged commit 1c33485 into master Jun 7, 2024
19 checks passed
@bassosimone bassosimone deleted the issue/2607h branch June 7, 2024 08:15
@bassosimone bassosimone added the 2024-06-richer-input Tracking 2024-06 richer input work label Jul 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2024-06-richer-input Tracking 2024-06 richer input work
Projects
None yet
2 participants