Total refactoring of tests

dmitry-lipetsk · dmitry-lipetsk · commit e6f4448bd992 · 2025-02-24T11:51:28.000+03:00
- TestgresRemoteTests does not use global variables and code
- Explicit work with ..testgres folder
diff --git a/run_tests.sh b/run_tests.sh
@@ -22,11 +22,11 @@ export VIRTUAL_ENV_DISABLE_PROMPT=1
 source $VENV_PATH/bin/activate
 
 # install utilities
-$PIP install coverage flake8 psutil Sphinx pytest pytest-xdist
+$PIP install coverage flake8 psutil Sphinx pytest pytest-xdist psycopg2 six psutil
 
 # install testgres' dependencies
 export PYTHONPATH=$(pwd)
-$PIP install .
+# $PIP install .
 
 # test code quality
 flake8 .
diff --git a/tests/test_local.py b/tests/test_local.py
@@ -4,9 +4,9 @@
 import re
 import tempfile
 
-from testgres import ExecUtilException
-from testgres import InvalidOperationException
-from testgres import LocalOperations
+from ..testgres import ExecUtilException
+from ..testgres import InvalidOperationException
+from ..testgres import LocalOperations
 
 from .helpers.run_conditions import RunConditions
 
diff --git a/tests/test_remote.py b/tests/test_remote.py
@@ -4,10 +4,10 @@
 import re
 import tempfile
 
-from testgres import ExecUtilException
-from testgres import InvalidOperationException
-from testgres import RemoteOperations
-from testgres import ConnectionParams
+from ..testgres import ExecUtilException
+from ..testgres import InvalidOperationException
+from ..testgres import RemoteOperations
+from ..testgres import ConnectionParams
 
 
 class TestRemoteOperations:
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -2,7 +2,6 @@
 import re
 import subprocess
 import tempfile
-import testgres
 import time
 import six
 import pytest
@@ -14,7 +13,9 @@
 from contextlib import contextmanager
 from shutil import rmtree
 
-from testgres import \
+from .. import testgres
+
+from ..testgres import \
     InitNodeException, \
     StartNodeException, \
     ExecUtilException, \
@@ -25,31 +26,32 @@
     InvalidOperationException, \
     NodeApp
 
-from testgres import \
+from ..testgres import \
     TestgresConfig, \
     configure_testgres, \
     scoped_config, \
     pop_config
 
-from testgres import \
+from ..testgres import \
     NodeStatus, \
     ProcessType, \
     IsolationLevel, \
     get_new_node
 
-from testgres import \
+from ..testgres import \
     get_bin_path, \
     get_pg_config, \
     get_pg_version
 
-from testgres import \
+from ..testgres import \
     First, \
     Any
 
 # NOTE: those are ugly imports
-from testgres import bound_ports
-from testgres.utils import PgVer, parse_pg_version
-from testgres.node import ProcessProxy
+from ..testgres import bound_ports
+from ..testgres.utils import PgVer, parse_pg_version
+from ..testgres.utils import file_tail
+from ..testgres.node import ProcessProxy
 
 
 def pg_version_ge(version):
@@ -874,8 +876,6 @@ def test_auto_name(self):
                 assert ('testgres' in r.name)
 
     def test_file_tail(self):
-        from testgres.utils import file_tail
-
         s1 = "the quick brown fox jumped over that lazy dog\n"
         s2 = "abc\n"
         s3 = "def\n"
diff --git a/tests/test_simple_remote.py b/tests/test_simple_remote.py
