Add general log test

tools-tests/sgcollect_info_test.py

@@ -1,16 +1,54 @@
-import sgcollect_info
 import unittest
 import io
 
+import pytest
+
+import sgcollect_info
+
+
+@pytest.mark.parametrize(
+    "config",
+    [
+        '{{"logfilepath": "{tmpdir}"}}',
+        '{{"Logging": {{ "default": {{ "logfilepath": "{log_file}" }} }} }}',
+        '{{"logging": {{ "log_file_path": "{tmpdir}" }} }}',
+    ],
+)
+def test_make_collect_logs_tasks(config, tmpdir):
+    log_file = tmpdir.join("sg_info.log")
+    log_file.write("foo")
+    with unittest.mock.patch(
+        "sgcollect_info.urlopen_with_basic_auth",
+        return_value=io.BytesIO(
+            config.format(
+                tmpdir=str(tmpdir).replace("\\", "\\\\"),
+                log_file=str(log_file).replace("\\", "\\\\"),
+            ).encode("utf-8")
+        ),
+    ):
+        rotated_log_file = tmpdir.join("sg_info-01.log.gz")
+        rotated_log_file.write("foo")
+        tasks = sgcollect_info.make_collect_logs_tasks(
+            tmpdir,
+            sg_url="fakeurl",
+            sg_config_file_path="",
+            sg_username="",
+            sg_password="",
+            salt="",
+            should_redact=False,
+        )
+        assert [t.log_file for t in tasks] == [
+            log_file.basename,
+            rotated_log_file.basename,
+        ]
+
 
-def test_make_collect_logs_tasks(tmpdir):
+def test_make_collect_logs_heap_profile(tmpdir):
     with unittest.mock.patch(
         "sgcollect_info.urlopen_with_basic_auth",
         return_value=io.BytesIO(
-            '{{"logfilepath": "{logdir}"}}'.format(
-                logdir=str(tmpdir).replace(
-                    "\\", "\\\\"
-                )  # replace backslashes with double backslashes for windows paths in json
+            '{{"logfilepath": "{logpath}"}}'.format(
+                logpath=str(tmpdir).replace("\\", "\\\\")
             ).encode("utf-8")
         ),
     ):