Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
Signed-off-by: Marius Sincovici <[email protected]>
  • Loading branch information
mariusSincovici committed Dec 17, 2024
1 parent c4d0c1d commit 9ac7964
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 0 additions & 1 deletion test/qa/lib/network.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from threading import Thread

import dns.resolver
import pytest
import requests
import sh

Expand Down
6 changes: 5 additions & 1 deletion test/qa/test_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import sh

import lib
from lib import daemon, fileshare, login, meshnet, network, poll, ssh
from lib import daemon, fileshare, login, meshnet, network, poll, ssh, firewall, logging
from test_connect import connect_base_test, disconnect_base_test

PROJECT_ROOT = os.environ['WORKDIR']
Expand All @@ -27,6 +27,7 @@ def setup_module(module): # noqa: ARG001


def setup_function(function): # noqa: ARG001
firewall.is_empty()
TestData.INVOLVES_MESHNET = any(keyword in os.environ["PYTEST_CURRENT_TEST"] for keyword in ["meshnet", "fileshare"])

sh.sudo.apt.purge("-y", "nordvpn")
Expand All @@ -44,6 +45,7 @@ def setup_function(function): # noqa: ARG001
daemon.start() # TODO: LVPN-6403

if TestData.INVOLVES_MESHNET:
logging.log("meshnet test setup")
sh.nordvpn.set.notify.off()
assert "Meshnet is set to 'enabled' successfully." in sh.nordvpn.set.meshnet.on()

Expand All @@ -61,6 +63,7 @@ def setup_function(function): # noqa: ARG001

def teardown_function(function): # noqa: ARG001
if TestData.INVOLVES_MESHNET:
logging.log("meshnet test cleanup")
ssh_client.exec_command("rm -rf /root/Downloads/*")

sh.nordvpn.set.mesh.off()
Expand All @@ -75,6 +78,7 @@ def teardown_function(function): # noqa: ARG001

daemon.uninstall_peer(ssh_client)
daemon.stop() # TODO: LVPN-6403
assert firewall.is_empty()


def test_meshnet_available_after_update():
Expand Down

0 comments on commit 9ac7964

Please sign in to comment.