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.
This commit is contained in:
@@ -3,6 +3,7 @@ import select
|
||||
import socket
|
||||
import time
|
||||
|
||||
import pytest
|
||||
from conftest import run_process
|
||||
from unit.applications.lang.python import TestApplicationPython
|
||||
from unit.utils import waitforsocket
|
||||
@@ -13,6 +14,26 @@ class TestProxyChunked(TestApplicationPython):
|
||||
|
||||
SERVER_PORT = 7999
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_method_fixture(self):
|
||||
run_process(self.run_server, self.SERVER_PORT)
|
||||
waitforsocket(self.SERVER_PORT)
|
||||
|
||||
assert 'success' in self.conf(
|
||||
{
|
||||
"listeners": {
|
||||
"*:7080": {"pass": "routes"},
|
||||
},
|
||||
"routes": [
|
||||
{
|
||||
"action": {
|
||||
"proxy": f'http://127.0.0.1:{self.SERVER_PORT}'
|
||||
}
|
||||
}
|
||||
],
|
||||
}
|
||||
), 'proxy initial configuration'
|
||||
|
||||
@staticmethod
|
||||
def run_server(server_port):
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
@@ -83,25 +104,6 @@ class TestProxyChunked(TestApplicationPython):
|
||||
def get_http10(self, *args, **kwargs):
|
||||
return self.get(*args, http_10=True, **kwargs)
|
||||
|
||||
def setup_method(self):
|
||||
run_process(self.run_server, self.SERVER_PORT)
|
||||
waitforsocket(self.SERVER_PORT)
|
||||
|
||||
assert 'success' in self.conf(
|
||||
{
|
||||
"listeners": {
|
||||
"*:7080": {"pass": "routes"},
|
||||
},
|
||||
"routes": [
|
||||
{
|
||||
"action": {
|
||||
"proxy": f'http://127.0.0.1:{self.SERVER_PORT}'
|
||||
}
|
||||
}
|
||||
],
|
||||
}
|
||||
), 'proxy initial configuration'
|
||||
|
||||
def test_proxy_chunked(self):
|
||||
for _ in range(10):
|
||||
assert self.get_http10(body='\r\n\r\n0\r\n\r\n')['status'] == 200
|
||||
|
||||
Reference in New Issue
Block a user