diff options
| author | Andrei Belov <defan@nginx.com> | 2021-02-04 18:40:45 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2021-02-04 18:40:45 +0300 |
| commit | 0997fa324ca523ab282f595ac9f44b3e4daff86a (patch) | |
| tree | 37424fff265780f34f9a9adb7ddd7501a67843f1 /test/test_static.py | |
| parent | 2bc99c614d5547e773bda73364efada47f0a37bf (diff) | |
| parent | 774a6034d9daf32ac6c98da7e4c0ca9e820536b4 (diff) | |
| download | unit-0997fa324ca523ab282f595ac9f44b3e4daff86a.tar.gz unit-0997fa324ca523ab282f595ac9f44b3e4daff86a.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'test/test_static.py')
| -rw-r--r-- | test/test_static.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/test_static.py b/test/test_static.py index a65928ca..3e85b435 100644 --- a/test/test_static.py +++ b/test/test_static.py @@ -2,10 +2,9 @@ import os import socket import pytest - -from conftest import option -from conftest import waitforfiles from unit.applications.proto import TestApplicationProto +from unit.option import option +from unit.utils import waitforfiles class TestStatic(TestApplicationProto): |