summaryrefslogtreecommitdiffhomepage
path: root/test/test_routing.py
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2020-12-08 14:37:33 +0000
committerAndrei Zeliankou <zelenkov@nginx.com>2020-12-08 14:37:33 +0000
commitb2e767819f04153944d525ef8d97d2f3a7a9af74 (patch)
tree29748112e707e1cdd3cb1b556a3f437114e5898a /test/test_routing.py
parent8f916285639d7f9aac9ef03cace5e4dcbcca70cd (diff)
downloadunit-b2e767819f04153944d525ef8d97d2f3a7a9af74.tar.gz
unit-b2e767819f04153944d525ef8d97d2f3a7a9af74.tar.bz2
Tests: skip_alert() converted to the fixture.
Diffstat (limited to 'test/test_routing.py')
-rw-r--r--test/test_routing.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/test_routing.py b/test/test_routing.py
index a49075ae..30f25a9c 100644
--- a/test/test_routing.py
+++ b/test/test_routing.py
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
import pytest
-from conftest import skip_alert
from unit.applications.proto import TestApplicationProto
from unit.option import option
@@ -366,7 +365,7 @@ class TestRouting(TestApplicationProto):
assert self.get()['status'] == 200, 'route match absent'
- def test_routes_route_action_absent(self):
+ def test_routes_route_action_absent(self, skip_alert):
skip_alert(r'failed to apply new conf')
assert 'error' in self.conf(
@@ -755,7 +754,7 @@ class TestRouting(TestApplicationProto):
'routes/main'
), 'route edit configure 9'
- def test_match_edit(self):
+ def test_match_edit(self, skip_alert):
skip_alert(r'failed to apply new conf')
self.route_match({"method": ["GET", "POST"]})
@@ -1352,7 +1351,7 @@ class TestRouting(TestApplicationProto):
assert self.get(url='/?var2=val2')['status'] == 404, 'arr 7'
assert self.get(url='/?var3=foo')['status'] == 200, 'arr 8'
- def test_routes_match_arguments_invalid(self):
+ def test_routes_match_arguments_invalid(self, skip_alert):
# TODO remove it after controller fixed
skip_alert(r'failed to apply new conf')