From ce2405ec3dd97e8bdf8f63312e3c6ce59ef562d4 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Mon, 12 Jun 2023 14:16:59 +0100 Subject: 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. --- test/test_configuration.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/test_configuration.py') 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( { -- cgit