summaryrefslogtreecommitdiffhomepage
path: root/test/test_configuration.py
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2023-06-12 14:16:59 +0100
committerAndrei Zeliankou <zelenkov@nginx.com>2023-06-12 14:16:59 +0100
commitce2405ec3dd97e8bdf8f63312e3c6ce59ef562d4 (patch)
tree818e60eb10d7f2be90f25003b3a2b347314e966f /test/test_configuration.py
parenta3b9b49cfb091410ca8f3c8d9df24d1fe184f8e0 (diff)
downloadunit-ce2405ec3dd97e8bdf8f63312e3c6ce59ef562d4.tar.gz
unit-ce2405ec3dd97e8bdf8f63312e3c6ce59ef562d4.tar.bz2
Tests: prerequisites checking reworked.
Prerequisites check moved to the module level to simplify class structure. Discovery and prerequisites checks functions moved to the separate files. Introduced "require" fixture to provide per-test requirements check.
Diffstat (limited to 'test/test_configuration.py')
-rw-r--r--test/test_configuration.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/test_configuration.py b/test/test_configuration.py
index e78a2957..0c48ad57 100644
--- a/test/test_configuration.py
+++ b/test/test_configuration.py
@@ -3,10 +3,10 @@ import socket
import pytest
from unit.control import TestControl
+prerequisites = {'modules': {'python': 'any'}}
-class TestConfiguration(TestControl):
- prerequisites = {'modules': {'python': 'any'}}
+class TestConfiguration(TestControl):
def try_addr(self, addr):
return self.conf(
{
@@ -420,10 +420,10 @@ class TestConfiguration(TestControl):
assert 'success' in self.conf(conf)
- def test_unprivileged_user_error(self, is_su, skip_alert):
+ def test_unprivileged_user_error(self, require, skip_alert):
+ require({'privileged_user': False})
+
skip_alert(r'cannot set user "root"', r'failed to apply new conf')
- if is_su:
- pytest.skip('unprivileged tests')
assert 'error' in self.conf(
{