From 18fcc07c7796889fe1cc4bc86564459ccd387ae7 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Thu, 25 May 2023 16:56:14 +0100 Subject: 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. --- test/test_client_ip.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'test/test_client_ip.py') diff --git a/test/test_client_ip.py b/test/test_client_ip.py index d0e7b793..59e170f1 100644 --- a/test/test_client_ip.py +++ b/test/test_client_ip.py @@ -1,3 +1,4 @@ +import pytest from unit.applications.lang.python import TestApplicationPython from unit.option import option @@ -5,6 +6,10 @@ from unit.option import option class TestClientIP(TestApplicationPython): prerequisites = {'modules': {'python': 'any'}} + @pytest.fixture(autouse=True) + def setup_method_fixture(self): + self.load('client_ip') + def client_ip(self, options): assert 'success' in self.conf( { @@ -39,9 +44,6 @@ class TestClientIP(TestApplicationPython): headers={'Connection': 'close', 'X-Forwarded-For': xff}, )['body'] - def setup_method(self): - self.load('client_ip') - def test_client_ip_single_ip(self): self.client_ip( {'header': 'X-Forwarded-For', 'source': '123.123.123.123'} -- cgit