From 0c68053fbd4940dae4c84a5339e58678d194089b Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Wed, 2 Apr 2025 18:28:23 +0300 Subject: [PATCH] Test files and classes were renamed CI for AltLinux (10, 11) tests all the "local" cases. --- Dockerfile--altlinux_10.tmpl | 2 +- Dockerfile--altlinux_11.tmpl | 2 +- run_tests.sh | 2 +- tests/{test_local.py => test_os_ops_local.py} | 2 +- tests/{test_remote.py => test_os_ops_remote.py} | 2 +- tests/{test_simple.py => test_testgres_local.py} | 2 +- tests/{test_simple_remote.py => test_testgres_remote.py} | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename tests/{test_local.py => test_os_ops_local.py} (98%) rename tests/{test_remote.py => test_os_ops_remote.py} (98%) rename tests/{test_simple.py => test_testgres_local.py} (99%) rename tests/{test_simple_remote.py => test_testgres_remote.py} (99%) diff --git a/Dockerfile--altlinux_10.tmpl b/Dockerfile--altlinux_10.tmpl index e60e9320..a75e35a0 100644 --- a/Dockerfile--altlinux_10.tmpl +++ b/Dockerfile--altlinux_10.tmpl @@ -115,4 +115,4 @@ ssh-keygen -t rsa -f ~/.ssh/id_rsa -q -N ''; \ cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys; \ chmod 600 ~/.ssh/authorized_keys; \ ls -la ~/.ssh/; \ -TEST_FILTER=\"TestgresTests or (TestTestgresCommon and (not remote_ops))\" bash ./run_tests.sh;" +TEST_FILTER=\"TestTestgresLocal or TestOsOpsLocal or local_ops\" bash ./run_tests.sh;" diff --git a/Dockerfile--altlinux_11.tmpl b/Dockerfile--altlinux_11.tmpl index 4b591632..5b43da20 100644 --- a/Dockerfile--altlinux_11.tmpl +++ b/Dockerfile--altlinux_11.tmpl @@ -115,4 +115,4 @@ ssh-keygen -t rsa -f ~/.ssh/id_rsa -q -N ''; \ cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys; \ chmod 600 ~/.ssh/authorized_keys; \ ls -la ~/.ssh/; \ -TEST_FILTER=\"TestgresTests or (TestTestgresCommon and (not remote_ops))\" bash ./run_tests.sh;" +TEST_FILTER=\"TestTestgresLocal or TestOsOpsLocal or local_ops\" bash ./run_tests.sh;" diff --git a/run_tests.sh b/run_tests.sh index a40a97cf..8202aff5 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -5,7 +5,7 @@ set -eux if [ -z ${TEST_FILTER+x} ]; \ -then export TEST_FILTER="TestgresTests or (TestTestgresCommon and (not remote_ops))"; \ +then export TEST_FILTER="TestTestgresLocal or (TestTestgresCommon and (not remote_ops))"; \ fi # fail early diff --git a/tests/test_local.py b/tests/test_os_ops_local.py similarity index 98% rename from tests/test_local.py rename to tests/test_os_ops_local.py index e82df989..2e3c30b7 100644 --- a/tests/test_local.py +++ b/tests/test_os_ops_local.py @@ -8,7 +8,7 @@ import re -class TestLocalOperations: +class TestOsOpsLocal: @pytest.fixture def os_ops(self): return OsOpsDescrs.sm_local_os_ops diff --git a/tests/test_remote.py b/tests/test_os_ops_remote.py similarity index 98% rename from tests/test_remote.py rename to tests/test_os_ops_remote.py index a37e258e..58b09242 100755 --- a/tests/test_remote.py +++ b/tests/test_os_ops_remote.py @@ -9,7 +9,7 @@ import pytest -class TestRemoteOperations: +class TestOsOpsRemote: @pytest.fixture def os_ops(self): return OsOpsDescrs.sm_remote_os_ops diff --git a/tests/test_simple.py b/tests/test_testgres_local.py similarity index 99% rename from tests/test_simple.py rename to tests/test_testgres_local.py index 6ca52cb0..01f975a0 100644 --- a/tests/test_simple.py +++ b/tests/test_testgres_local.py @@ -74,7 +74,7 @@ def rm_carriage_returns(out): return out -class TestgresTests: +class TestTestgresLocal: def test_node_repr(self): with get_new_node() as node: pattern = r"PostgresNode\(name='.+', port=.+, base_dir='.+'\)" diff --git a/tests/test_simple_remote.py b/tests/test_testgres_remote.py similarity index 99% rename from tests/test_simple_remote.py rename to tests/test_testgres_remote.py index c16fe53f..2142e5ba 100755 --- a/tests/test_simple_remote.py +++ b/tests/test_testgres_remote.py @@ -47,7 +47,7 @@ def good_properties(f): return True -class TestgresRemoteTests: +class TestTestgresRemote: sm_os_ops = OsOpsDescrs.sm_remote_os_ops @pytest.fixture(autouse=True, scope="class")