From 18fcc07c7796889fe1cc4bc86564459ccd387ae7 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
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_njs.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'test/test_njs.py')

diff --git a/test/test_njs.py b/test/test_njs.py
index bd89e16d..86a8a4ba 100644
--- a/test/test_njs.py
+++ b/test/test_njs.py
@@ -1,5 +1,6 @@
 import os
 
+import pytest
 from unit.applications.proto import TestApplicationProto
 from unit.option import option
 from unit.utils import waitforfiles
@@ -8,12 +9,13 @@ from unit.utils import waitforfiles
 class TestNJS(TestApplicationProto):
     prerequisites = {'modules': {'njs': 'any'}}
 
-    def setup_method(self):
+    @pytest.fixture(autouse=True)
+    def setup_method_fixture(self, temp_dir):
         assert 'success' in self.conf(
             {
                 "listeners": {"*:7080": {"pass": "routes"}},
                 "routes": [
-                    {"action": {"share": f"{option.temp_dir}/assets$uri"}}
+                    {"action": {"share": f"{temp_dir}/assets$uri"}}
                 ],
             }
         )
-- 
cgit