summaryrefslogtreecommitdiffhomepage
path: root/test/test_java_websockets.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/test_java_websockets.py')
-rw-r--r--test/test_java_websockets.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/test_java_websockets.py b/test/test_java_websockets.py
index 7586d4aa..315c496d 100644
--- a/test/test_java_websockets.py
+++ b/test/test_java_websockets.py
@@ -2,11 +2,9 @@ import struct
import time
import pytest
-
-from conftest import option
-from conftest import skip_alert
from unit.applications.lang.java import TestApplicationJava
from unit.applications.websockets import TestApplicationWebsocket
+from unit.option import option
class TestJavaWebsockets(TestApplicationJava):
@@ -14,7 +12,8 @@ class TestJavaWebsockets(TestApplicationJava):
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'