summaryrefslogtreecommitdiffhomepage
path: root/test/test_share_fallback.py
diff options
context:
space:
mode:
authorAndrei Belov <defan@nginx.com>2021-02-04 18:40:45 +0300
committerAndrei Belov <defan@nginx.com>2021-02-04 18:40:45 +0300
commit0997fa324ca523ab282f595ac9f44b3e4daff86a (patch)
tree37424fff265780f34f9a9adb7ddd7501a67843f1 /test/test_share_fallback.py
parent2bc99c614d5547e773bda73364efada47f0a37bf (diff)
parent774a6034d9daf32ac6c98da7e4c0ca9e820536b4 (diff)
downloadunit-0997fa324ca523ab282f595ac9f44b3e4daff86a.tar.gz
unit-0997fa324ca523ab282f595ac9f44b3e4daff86a.tar.bz2
Merged with the default branch.
Diffstat (limited to 'test/test_share_fallback.py')
-rw-r--r--test/test_share_fallback.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/test_share_fallback.py b/test/test_share_fallback.py
index 462da9de..a02cb1a3 100644
--- a/test/test_share_fallback.py
+++ b/test/test_share_fallback.py
@@ -1,8 +1,7 @@
import os
-from conftest import option
-from conftest import skip_alert
from unit.applications.proto import TestApplicationProto
+from unit.option import option
class TestStatic(TestApplicationProto):
@@ -117,7 +116,7 @@ class TestStatic(TestApplicationProto):
assert resp['status'] == 200, 'fallback proxy status'
assert resp['body'] == '', 'fallback proxy'
- def test_fallback_proxy_loop(self):
+ def test_fallback_proxy_loop(self, skip_alert):
skip_alert(
r'open.*/blah/index.html.*failed',
r'accept.*failed',