diff --git a/Dockerfile--altlinux_10.tmpl b/Dockerfile--altlinux_10.tmpl index d78b05f5..5752b698 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=\"TestTestgresLocal or TestOsOpsLocal or local\" bash ./run_tests.sh;" +TEST_FILTER=\"\" bash ./run_tests.sh;" diff --git a/Dockerfile--altlinux_11.tmpl b/Dockerfile--altlinux_11.tmpl index 5c88585d..5d3615fe 100644 --- a/Dockerfile--altlinux_11.tmpl +++ b/Dockerfile--altlinux_11.tmpl @@ -11,6 +11,9 @@ RUN apt-get update RUN apt-get install -y openssh-server openssh-clients RUN apt-get install -y time +# pgrep (for testgres.os_ops) +RUN apt-get install -y procps + # RUN apt-get install -y mc RUN apt-get install -y libsqlite3-devel @@ -115,4 +118,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=\"TestTestgresLocal or TestOsOpsLocal or local\" bash ./run_tests.sh;" +TEST_FILTER=\"\" bash ./run_tests.sh;" diff --git a/tests/test_os_ops_common.py b/tests/test_os_ops_common.py index 46d3129d..05ea1eb5 100644 --- a/tests/test_os_ops_common.py +++ b/tests/test_os_ops_common.py @@ -876,8 +876,16 @@ def test_get_tmpdir__compare_with_py_info(self, os_ops: OsOperations): actual_dir = os_ops.get_tempdir() assert actual_dir is not None assert type(actual_dir) == str # noqa: E721 - expected_dir = str(tempfile.tempdir) - assert actual_dir == expected_dir + + # -------- + cmd = [sys.executable, "-c", "import tempfile;print(tempfile.gettempdir());"] + + expected_dir_b = os_ops.exec_command(cmd) + assert type(expected_dir_b) == bytes # noqa: E721 + expected_dir = expected_dir_b.decode() + assert type(expected_dir) == str # noqa: E721 + assert actual_dir + "\n" == expected_dir + return class tagData_OS_OPS__NUMS: os_ops_descr: OsOpsDescr