Skip to content

Commit

Permalink
Merge pull request #743 from NordSecurity/LLT-5428_fix_v3_vs_v5_telio…
Browse files Browse the repository at this point in the history
…_compatability_test

fix version compatability test
  • Loading branch information
gytsto authored Aug 12, 2024
2 parents 8ecfa61 + 3195c60 commit d208071
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
Empty file added .unreleased/LLT-5428
Empty file.
11 changes: 7 additions & 4 deletions nat-lab/tests/test_telio_version_compatibility.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import asyncio
import json
import pytest
import shlex
import telio
from contextlib import AsyncExitStack
from mesh_api import API
Expand Down Expand Up @@ -48,7 +49,6 @@
"endpoint_providers, client1_type, client2_type, adapter_type",
UHP_conn_client_types,
)
@pytest.mark.skip("Disabled for now, until LLT-5428 is resolved")
async def test_connect_different_telio_version_through_relay(
endpoint_providers,
client1_type,
Expand Down Expand Up @@ -123,9 +123,12 @@ async def on_stdout_stderr(output):
await started_event.wait()
await beta_router.setup_interface(beta.ip_addresses)
await beta_router.create_meshnet_route()
await beta_client_v3_6.escape_and_write_stdin(
["mesh", "config", json.dumps(api.get_meshmap(beta.id))]
)

await beta_client_v3_6.escape_and_write_stdin([
"mesh",
"config",
shlex.quote(json.dumps(api.get_meshmap(beta.id))),
])

await alpha_client.wait_for_state_on_any_derp([telio.State.Connected])
await alpha_client.wait_for_state_peer(beta.public_key, [telio.State.Connected])
Expand Down

0 comments on commit d208071

Please sign in to comment.