diff options
| author | Andrei Zeliankou <zelenkov@nginx.com> | 2023-05-25 16:56:14 +0100 |
|---|---|---|
| committer | Andrei Zeliankou <zelenkov@nginx.com> | 2023-05-25 16:56:14 +0100 |
| commit | 18fcc07c7796889fe1cc4bc86564459ccd387ae7 (patch) | |
| tree | b38ea8171bb88ccdee8317747389789944198fc4 /test/test_static.py | |
| parent | 3e4fa1e2022970dee003bea0932ea0c10f8744ba (diff) | |
| download | unit-18fcc07c7796889fe1cc4bc86564459ccd387ae7.tar.gz unit-18fcc07c7796889fe1cc4bc86564459ccd387ae7.tar.bz2 | |
Tests: unified setup method usage.
To make fixtures accessible inside of setup methods in tests all these methods
are renamed to the "setup_method_fixture" and decorated by autouse flag.
Also all setup methods moved to the top of the files.
Diffstat (limited to 'test/test_static.py')
| -rw-r--r-- | test/test_static.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/test/test_static.py b/test/test_static.py index f7eade7c..48004661 100644 --- a/test/test_static.py +++ b/test/test_static.py @@ -3,21 +3,21 @@ import socket import pytest from unit.applications.proto import TestApplicationProto -from unit.option import option from unit.utils import waitforfiles class TestStatic(TestApplicationProto): prerequisites = {} - def setup_method(self): - os.makedirs(f'{option.temp_dir}/assets/dir') - with open(f'{option.temp_dir}/assets/index.html', 'w') as index, open( - f'{option.temp_dir}/assets/README', 'w' - ) as readme, open( - f'{option.temp_dir}/assets/log.log', 'w' - ) as log, open( - f'{option.temp_dir}/assets/dir/file', 'w' + @pytest.fixture(autouse=True) + def setup_method_fixture(self, temp_dir): + os.makedirs(f'{temp_dir}/assets/dir') + assets_dir = f'{temp_dir}/assets' + + with open(f'{assets_dir}/index.html', 'w') as index, open( + f'{assets_dir}/README', 'w' + ) as readme, open(f'{assets_dir}/log.log', 'w') as log, open( + f'{assets_dir}/dir/file', 'w' ) as file: index.write('0123456789') readme.write('readme') @@ -27,9 +27,7 @@ class TestStatic(TestApplicationProto): self._load_conf( { "listeners": {"*:7080": {"pass": "routes"}}, - "routes": [ - {"action": {"share": f'{option.temp_dir}/assets$uri'}} - ], + "routes": [{"action": {"share": f'{assets_dir}$uri'}}], "settings": { "http": { "static": { |