Merge pull request #209 from dmitry-lipetsk/D20250311_002--tests_on_alpine

dmitry-lipetsk · web-flow · commit dbf6626293da · 2025-03-11T13:22:23.000+03:00
[remote] Tests are updated to support Alpine Linux
diff --git a/tests/test_local.py b/tests/test_local.py
@@ -57,9 +57,17 @@ def test_exec_command_failure(self):
             try:
                 self.operations.exec_command(cmd, wait_exit=True, shell=True)
             except ExecUtilException as e:
-                assert e.message == "Utility exited with non-zero code (127). Error: `/bin/sh: 1: nonexistent_command: not found`"
+                assert type(e.exit_code) == int  # noqa: E721
+                assert e.exit_code == 127
+
+                assert type(e.message) == str  # noqa: E721
                 assert type(e.error) == bytes  # noqa: E721
-                assert e.error.strip() == b"/bin/sh: 1: nonexistent_command: not found"
+
+                assert e.message.startswith("Utility exited with non-zero code (127). Error:")
+                assert "nonexistent_command" in e.message
+                assert "not found" in e.message
+                assert b"nonexistent_command" in e.error
+                assert b"not found" in e.error
                 break
             raise Exception("We wait an exception!")
 
@@ -73,9 +81,11 @@ def test_exec_command_failure__expect_error(self):
 
         exit_status, result, error = self.operations.exec_command(cmd, verbose=True, wait_exit=True, shell=True, expect_error=True)
 
-        assert error == b'/bin/sh: 1: nonexistent_command: not found\n'
         assert exit_status == 127
         assert result == b''
+        assert type(error) == bytes  # noqa: E721
+        assert b"nonexistent_command" in error
+        assert b"not found" in error
 
     def test_read__text(self):
         """
diff --git a/tests/test_remote.py b/tests/test_remote.py
@@ -41,9 +41,17 @@ def test_exec_command_failure(self):
             try:
                 self.operations.exec_command(cmd, verbose=True, wait_exit=True)
             except ExecUtilException as e:
-                assert e.message == "Utility exited with non-zero code (127). Error: `bash: line 1: nonexistent_command: command not found`"
+                assert type(e.exit_code) == int  # noqa: E721
+                assert e.exit_code == 127
+
+                assert type(e.message) == str  # noqa: E721
                 assert type(e.error) == bytes  # noqa: E721
-                assert e.error.strip() == b"bash: line 1: nonexistent_command: command not found"
+
+                assert e.message.startswith("Utility exited with non-zero code (127). Error:")
+                assert "nonexistent_command" in e.message
+                assert "not found" in e.message
+                assert b"nonexistent_command" in e.error
+                assert b"not found" in e.error
                 break
             raise Exception("We wait an exception!")
 
@@ -55,9 +63,11 @@ def test_exec_command_failure__expect_error(self):
 
         exit_status, result, error = self.operations.exec_command(cmd, verbose=True, wait_exit=True, shell=True, expect_error=True)
 
-        assert error == b'bash: line 1: nonexistent_command: command not found\n'
         assert exit_status == 127
         assert result == b''
+        assert type(error) == bytes  # noqa: E721
+        assert b"nonexistent_command" in error
+        assert b"not found" in error
 
     def test_is_executable_true(self):
         """
@@ -344,11 +354,13 @@ def test_read__unknown_file(self):
         Test RemoteOperations::read with unknown file.
         """
 
-        with pytest.raises(
-                ExecUtilException,
-                match=re.escape("cat: /dummy: No such file or directory")):
+        with pytest.raises(ExecUtilException) as x:
             self.operations.read("/dummy")
 
+        assert "Utility exited with non-zero code (1)." in str(x.value)
+        assert "No such file or directory" in str(x.value)
+        assert "/dummy" in str(x.value)
+
     def test_read_binary__spec(self):
         """
         Test RemoteOperations::read_binary.
@@ -388,9 +400,13 @@ def test_read_binary__spec__unk_file(self):
         Test RemoteOperations::read_binary with unknown file.
         """
 
-        with pytest.raises(ExecUtilException, match=re.escape("tail: cannot open '/dummy' for reading: No such file or directory")):
+        with pytest.raises(ExecUtilException) as x:
             self.operations.read_binary("/dummy", 0)
 
+        assert "Utility exited with non-zero code (1)." in str(x.value)
+        assert "No such file or directory" in str(x.value)
+        assert "/dummy" in str(x.value)
+
     def test_read_binary__spec__negative_offset(self):
         """
         Test RemoteOperations::read_binary with negative offset.
@@ -419,9 +435,13 @@ def test_get_file_size__unk_file(self):
         Test RemoteOperations::get_file_size.
         """
 
-        with pytest.raises(ExecUtilException, match=re.escape("du: cannot access '/dummy': No such file or directory")):
+        with pytest.raises(ExecUtilException) as x:
             self.operations.get_file_size("/dummy")
 
+        assert "Utility exited with non-zero code (1)." in str(x.value)
+        assert "No such file or directory" in str(x.value)
+        assert "/dummy" in str(x.value)
+
     def test_touch(self):
         """
         Test touch for creating a new file or updating access and modification times of an existing file.
diff --git a/tests/test_simple_remote.py b/tests/test_simple_remote.py
@@ -163,6 +163,8 @@ def test_init__unk_LANG_and_LC_CTYPE(self):
                 ("\"", "\""),
             ]
 
+            errorIsDetected = False
+
             for unkData in unkDatas:
                 logging.info("----------------------")
                 logging.info("Unk LANG is [{0}]".format(unkData[0]))
@@ -193,7 +195,10 @@ def test_init__unk_LANG_and_LC_CTYPE(self):
                         assert isinstance(exc, ExecUtilException)
 
                 if exc is None:
-                    raise Exception("We expected an error!")
+                    logging.warning("We expected an error!")
+                    continue
+
+                errorIsDetected = True
 
                 assert isinstance(exc, ExecUtilException)
 
@@ -204,6 +209,9 @@ def test_init__unk_LANG_and_LC_CTYPE(self):
                 assert "initdb: error: invalid locale settings; check LANG and LC_* environment variables" in errMsg
                 continue
 
+            if not errorIsDetected:
+                pytest.xfail("All the bad data are processed without errors!")
+
         finally:
             __class__.helper__restore_envvar("LANG", prev_LANG)
             __class__.helper__restore_envvar("LANGUAGE", prev_LANGUAGE)
