LLT-7043: pytest fixtures for helpers by gytsto · Pull Request #1714 · NordSecurity/libtelio

gytsto · 2026-03-18T09:08:25Z

Problem

Nat-lab test files use a factory-pattern for environment setup where each test manually calls setup_mesh_nodes() or setup_environment() at runtime, managing AsyncExitStack lifecycle inline. This leads to:

Environment setup and teardown time is included in the test's reported runtime, inflating test durations and making it difficult to distinguish actual test logic performance from infrastructure overhead
Duplicated setup/teardown boilerplate across every test function
Inconsistent error handling during teardown (e.g. iptables cleanup failures crashing teardown)
Proliferation of specialized fixture variants (env_vpn_conntracked, env_pq_nlx_vpn, env_pq_nlx_vpn_rekey, etc.) that differ only in minor parameter mutations
Tight coupling between test logic and infrastructure orchestration, making tests harder to read and maintain

Solution

Introduce a helpers_fixtures.py module with two generic setup-phase fixtures — env_mesh and env — that handle all environment lifecycle in pytest's fixture phase. By moving setup into fixtures, environment provisioning and teardown time is no longer counted as part of the test's execution duration, giving more accurate test timing metrics. Key design decisions:

Dynamic node resolution: _resolve_setup_params() uses request.getfixturevalue() to auto-detect which alpha_setup_params, beta_setup_params, gamma_setup_params are parametrized on the test, eliminating the need for separate 1-node/2-node/3-node fixture variants
Compositional vpn_tags fixture: A default fixture returning [] that tests override at class/module level to inject VPN server connections, replacing dedicated VPN-specific fixtures
Autouse mutation fixtures: Test classes define small autouse fixtures (e.g. _mutate_pq_version, _mutate_conntracker) to apply parameter mutations, replacing 5 specialized environment fixtures with the generic env/env + composition
Robust teardown: linux_router.py wraps all iptables teardown commands in try/except ProcessExecError to prevent cascading failures

This reduces the fixture count from 22 specialized fixtures to 2 generic ones (plus 1 kept specialized: env_mesh_3node_ring_fw which requires pre-setup API manipulation). Each of the 19 converted test files gets its own commit for reviewability.

☑️ Definition of Done checklist

Commit history is clean (requirements)
README.md is updated
Functionality is covered by unit or integration tests

matislovas · 2026-04-06T19:25:57Z

-        assert (
-            preshared_after != preshared_before
-        ), "Preshared key not changed on the nlx server"
+            preshared_after = inspect_preshared_key(nlx_conn)


This should be await'ed ..? Or no?

looks like it should, but even before my changes it was not awaited, so idk how it worked 😄 will fix it

this is fixed now

tomasz-grz · 2026-04-15T11:26:59Z

+            except ProcessExecError:
+                log.warning(
+                    "disable_path cleanup: INPUT rule for %s already removed",


Should we check for the ProcessExecError error message like we do in DockerProcess, in case it failed with for some other reason? Otherwise log or re-raise the Exception

tomasz-grz · 2026-04-15T11:28:03Z

+                            inspect = await self._execute.inspect()
+                            await asyncio.sleep(0.01)
+                        if inspect["ExitCode"] is None:
+                            proc = subprocess.run(


Is subrocess.run() a blocking call?

it was, fixed

tomasz-grz · 2026-04-15T11:34:38Z

-                                "[%s] Cleanup failed: %s",
+                        while inspect["Pid"] == 0 and inspect["ExitCode"] is None:
+                            inspect = await self._execute.inspect()
+                            await asyncio.sleep(0.01)


I wonder if we can use await asyncio.wait_for() somehow to avoid the spin lock with the sleep()

tomasz-grz · 2026-04-15T11:39:11Z

+def _resolve_setup_params(request: pytest.FixtureRequest) -> List[SetupParameters]:
+    """Dynamically resolve available *_setup_params fixtures.
+
+    Tries alpha, beta, gamma in order. Stops at the first missing fixture.


Is there a case where we can expect only "alpha" and "gamma" to be defined?

there usually is not, but you pin pointed an issue, fixed

matislovas · 2026-04-19T16:45:39Z

+1

Add helpers_fixtures.py with generic env/env_mesh fixtures that use dynamic setup parameter resolution via _resolve_setup_params(). Includes vpn_tags compositional fixture pattern and supporting utility changes to docker_process.py and linux_router.py.

Convert test_vpn.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_mesh_plus_vpn.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_pq.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_adapter.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

…es.py Convert test_connection_states.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_direct_feature.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

…t.py Convert test_dns_through_exit.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

…_event.py Convert test_fire_connecting_event.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

…rt.py Convert test_flame_graph_chart.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_mesh_firewall.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

…e.py Convert test_mesh_remove_node.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_meshnet_id.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_neptun.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_network_monitor.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

…kering.py Convert test_node_state_flickering.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_pinging.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_proxy.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_reconnections.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

Convert test_telio_tasks.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

inspect_preshared_key is an async function, but was called without await. This caused the calls to return coroutine objects instead of executing the function body, silently skipping the internal preshared key assertions and making the rekey comparison always pass vacuously.

- helpers_fixtures.py: Use continue instead of break in _resolve_setup_params() to allow non-consecutive node configurations (e.g., alpha+gamma without beta) - linux_router.py: Check e.stderr content in ProcessExecError handlers before swallowing iptables cleanup errors, re-raise unexpected errors to avoid silently hiding real failures - docker_process.py: Replace blocking subprocess.run() with async asyncio.create_subprocess_exec() to avoid blocking the event loop during exec cleanup - docker_process.py: Replace spin lock with asyncio.wait_for() using a 10-second timeout to prevent infinite spinning, and extract _wait_for_process_start() and _kill_exec_if_running() helper methods to consolidate duplicated cleanup logic

gytsto requested a review from a team as a code owner March 18, 2026 09:08

gytsto force-pushed the LLT-7043_pytest_fixtures_for_helpers branch from 091ce6f to ca25ce6 Compare March 18, 2026 09:43

gytsto temporarily deployed to Internal March 18, 2026 09:43 — with GitHub Actions Inactive

gytsto force-pushed the LLT-7043_pytest_fixtures_for_helpers branch from ca25ce6 to 6cc08c4 Compare March 18, 2026 11:01

gytsto temporarily deployed to Internal March 18, 2026 11:01 — with GitHub Actions Inactive

gytsto force-pushed the LLT-7043_pytest_fixtures_for_helpers branch from 6cc08c4 to 1beffaa Compare March 18, 2026 11:29

gytsto temporarily deployed to Internal March 18, 2026 11:30 — with GitHub Actions Inactive

gytsto temporarily deployed to Internal March 18, 2026 11:47 — with GitHub Actions Inactive

gytsto temporarily deployed to Internal March 18, 2026 13:24 — with GitHub Actions Inactive

gytsto force-pushed the LLT-7043_pytest_fixtures_for_helpers branch from 4bcfab8 to e05187e Compare March 19, 2026 07:53

gytsto temporarily deployed to Internal March 19, 2026 07:53 — with GitHub Actions Inactive

gytsto marked this pull request as draft March 19, 2026 08:23

gytsto temporarily deployed to Internal March 19, 2026 12:50 — with GitHub Actions Inactive

gytsto temporarily deployed to Internal March 19, 2026 13:26 — with GitHub Actions Inactive

gytsto force-pushed the LLT-7043_pytest_fixtures_for_helpers branch from 26a88cd to 7c346ca Compare March 27, 2026 07:20

gytsto temporarily deployed to Internal March 27, 2026 07:20 — with GitHub Actions Inactive

gytsto force-pushed the LLT-7043_pytest_fixtures_for_helpers branch from 7c346ca to 2c3f2ac Compare March 27, 2026 08:31

gytsto temporarily deployed to Internal March 27, 2026 08:31 — with GitHub Actions Inactive

gytsto temporarily deployed to Internal March 27, 2026 09:48 — with GitHub Actions Inactive

gytsto marked this pull request as ready for review March 27, 2026 10:07

matislovas reviewed Apr 6, 2026

View reviewed changes

gytsto temporarily deployed to Internal April 8, 2026 06:49 — with GitHub Actions Inactive

gytsto changed the title ~~Llt 7043 pytest fixtures for helpers~~ LLT-7043: pytest fixtures for helpers Apr 14, 2026

tomasz-grz reviewed Apr 15, 2026

View reviewed changes

gytsto temporarily deployed to Internal April 16, 2026 08:16 — with GitHub Actions Inactive

gytsto force-pushed the LLT-7043_pytest_fixtures_for_helpers branch from 6bb1383 to 0e4a66e Compare April 16, 2026 09:57

gytsto temporarily deployed to Internal April 16, 2026 09:57 — with GitHub Actions Inactive

gytsto force-pushed the LLT-7043_pytest_fixtures_for_helpers branch from 0e4a66e to e8e2694 Compare April 27, 2026 06:42

gytsto temporarily deployed to Internal April 27, 2026 06:42 — with GitHub Actions Inactive

gytsto added 23 commits April 27, 2026 17:42

refactor(nat-lab): apply setup-phase fixtures to test_vpn.py

fb2be80

Convert test_vpn.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_mesh_plus_vpn.py

f0ba7b9

Convert test_mesh_plus_vpn.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_pq.py

a9a4cc9

Convert test_pq.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_adapter.py

a84139e

Convert test_adapter.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_connection_stat…

5322b3b

…es.py Convert test_connection_states.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_direct_feature.py

24beccb

Convert test_direct_feature.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_dns_through_exi…

a5d7fcb

…t.py Convert test_dns_through_exit.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_fire_connecting…

61caa03

…_event.py Convert test_fire_connecting_event.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_flame_graph_cha…

58ed5a0

…rt.py Convert test_flame_graph_chart.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_mesh_firewall.py

2413aa9

Convert test_mesh_firewall.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_mesh_remove_nod…

7459df3

…e.py Convert test_mesh_remove_node.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_meshnet_id.py

d189047

Convert test_meshnet_id.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_neptun.py

c4d440b

Convert test_neptun.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_network_monitor.py

9116a2a

Convert test_network_monitor.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_node_state_flic…

d9b4ea3

…kering.py Convert test_node_state_flickering.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_pinging.py

3e38321

Convert test_pinging.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_proxy.py

afc0b45

Convert test_proxy.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_reconnections.py

0c43ccc

Convert test_reconnections.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

refactor(nat-lab): apply setup-phase fixtures to test_telio_tasks.py

a4e6b06

Convert test_telio_tasks.py to use setup-phase env/env_mesh fixtures with compositional vpn_tags and autouse mutation fixtures instead of factory-pattern runtime setup.

update readme

1a4c414

gytsto force-pushed the LLT-7043_pytest_fixtures_for_helpers branch from e8e2694 to 98d4a91 Compare April 27, 2026 14:42

gytsto temporarily deployed to Internal April 27, 2026 14:48 — with GitHub Actions Inactive

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LLT-7043: pytest fixtures for helpers#1714

LLT-7043: pytest fixtures for helpers#1714
gytsto wants to merge 23 commits intomainfrom
LLT-7043_pytest_fixtures_for_helpers

gytsto commented Mar 18, 2026 •

edited

Loading

Uh oh!

matislovas Apr 6, 2026

Uh oh!

gytsto Apr 8, 2026

Uh oh!

gytsto Apr 9, 2026

Uh oh!

tomasz-grz Apr 15, 2026

Uh oh!

gytsto Apr 16, 2026

Uh oh!

tomasz-grz Apr 15, 2026

Uh oh!

gytsto Apr 16, 2026

Uh oh!

tomasz-grz Apr 15, 2026

Uh oh!

gytsto Apr 16, 2026

Uh oh!

tomasz-grz Apr 15, 2026

Uh oh!

gytsto Apr 16, 2026

Uh oh!

matislovas commented Apr 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

gytsto commented Mar 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Problem

Solution

☑️ Definition of Done checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

matislovas commented Apr 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

gytsto commented Mar 18, 2026 •

edited

Loading