From 07789a23e9c513dba87b020fae2989a57955e8a6 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Sun, 6 Dec 2020 16:01:59 +0000 Subject: Tests: options moved to the separate class. This change is necessary to separate the logic and prevent possible circular dependency. --- test/test_node_websockets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/test_node_websockets.py') diff --git a/test/test_node_websockets.py b/test/test_node_websockets.py index 7b65b5c1..84eb4c42 100644 --- a/test/test_node_websockets.py +++ b/test/test_node_websockets.py @@ -3,10 +3,10 @@ import time import pytest -from conftest import option from conftest import skip_alert from unit.applications.lang.node import TestApplicationNode from unit.applications.websockets import TestApplicationWebsocket +from unit.option import option class TestNodeWebsockets(TestApplicationNode): -- cgit From b2e767819f04153944d525ef8d97d2f3a7a9af74 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Tue, 8 Dec 2020 14:37:33 +0000 Subject: Tests: skip_alert() converted to the fixture. --- test/test_node_websockets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test_node_websockets.py') diff --git a/test/test_node_websockets.py b/test/test_node_websockets.py index 84eb4c42..d7444bf7 100644 --- a/test/test_node_websockets.py +++ b/test/test_node_websockets.py @@ -3,7 +3,6 @@ import time import pytest -from conftest import skip_alert from unit.applications.lang.node import TestApplicationNode from unit.applications.websockets import TestApplicationWebsocket from unit.option import option @@ -14,7 +13,8 @@ class TestNodeWebsockets(TestApplicationNode): ws = TestApplicationWebsocket() - def setup_method(self): + @pytest.fixture(autouse=True) + def setup_method_fixture(self, request, skip_alert): assert 'success' in self.conf( {'http': {'websocket': {'keepalive_interval': 0}}}, 'settings' ), 'clear keepalive_interval' -- cgit From 6dc9c47ccd26b23b61b7522803a667c2e515e260 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Wed, 13 Jan 2021 06:22:43 +0000 Subject: Tests: style. --- test/test_node_websockets.py | 1 - 1 file changed, 1 deletion(-) (limited to 'test/test_node_websockets.py') diff --git a/test/test_node_websockets.py b/test/test_node_websockets.py index d7444bf7..4f1e5906 100644 --- a/test/test_node_websockets.py +++ b/test/test_node_websockets.py @@ -2,7 +2,6 @@ import struct import time import pytest - from unit.applications.lang.node import TestApplicationNode from unit.applications.websockets import TestApplicationWebsocket from unit.option import option -- cgit