Azure Linux support: Addressing feedback #2

Author: rane-rajasi

src/core/src/bootstrap/EnvLayer.py

@@ -37,7 +37,7 @@ class EnvLayer(object):
     def __init__(self, real_record_path=None, recorder_enabled=False, emulator_enabled=False):
         # Recorder / emulator storage
         self.__real_record_path = real_record_path
-        self.__real_record_pointer_path = real_record_path + ".pt"
+        self.__real_record_pointer_path = real_record_path + ".pt" if real_record_path is not None else None
         self.__real_record_handle = None
         self.__real_record_pointer = 0
 
@@ -55,7 +55,7 @@ def __init__(self, real_record_path=None, recorder_enabled=False, emulator_enabl
         self.platform = self.Platform(recorder_enabled, emulator_enabled, self.__write_record, self.__read_record)
         self.datetime = self.DateTime(recorder_enabled, emulator_enabled, self.__write_record, self.__read_record)
         self.file_system = self.FileSystem(recorder_enabled, emulator_enabled, self.__write_record, self.__read_record,
-                                           emulator_root_path=os.path.dirname(self.__real_record_path))
+                                           emulator_root_path=os.path.dirname(self.__real_record_path) if self.__real_record_path is not None else self.__real_record_path)
 
         # Constant paths
         self.etc_environment_file_path = "/etc/environment"

src/core/src/package_managers/TdnfPackageManager.py

@@ -31,7 +31,7 @@ def __init__(self, env_layer, execution_config, composite_logger, telemetry_writ
         super(TdnfPackageManager, self).__init__(env_layer, execution_config, composite_logger, telemetry_writer, status_handler)
         # Repo refresh
         self.cmd_clean_cache = "sudo tdnf clean expire-cache"
-        self.cmd_repo_refresh_template = "sudo tdnf -q list updates"
+        self.cmd_repo_refresh = "sudo tdnf -q list updates"
 
         # Support to get updates and their dependencies
         self.tdnf_check = 'sudo tdnf -q list updates'
@@ -87,7 +87,7 @@ def __init__(self, env_layer, execution_config, composite_logger, telemetry_writ
     def refresh_repo(self):
         self.composite_logger.log("[TDNF] Refreshing local repo...")
         self.invoke_package_manager(self.cmd_clean_cache)
-        self.invoke_package_manager(self.cmd_repo_refresh_template)
+        self.invoke_package_manager(self.cmd_repo_refresh)
 
     # region Get Available Updates
     def invoke_package_manager_advanced(self, command, raise_on_exception=True):

src/core/tests/Test_EnvLayer.py

@@ -0,0 +1,87 @@
+# Copyright 2025 Microsoft Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Requires Python 2.7+
+import platform
+import unittest
+from core.src.bootstrap.EnvLayer import EnvLayer
+from core.src.bootstrap.Constants import Constants
+
+
+class TestExecutionConfig(unittest.TestCase):
+    def setUp(self):
+        self.envlayer = EnvLayer()
+
+    def tearDown(self):
+        pass
+
+    # region setup mocks
+    def mock_platform_system(self):
+        return 'Linux'
+
+    def mock_linux_distribution(self):
+        return ['test', 'test', 'test']
+
+    def mock_linux_distribution_to_return_azure_linux(self):
+        return ['Microsoft Azure Linux', '3.0', '']
+
+    def mock_run_command_for_apt(self, cmd, no_output=False, chk_err=False):
+        if cmd.find("which apt-get") > -1:
+            return 0, ''
+        return -1, ''
+
+    def mock_run_command_for_yum(self, cmd, no_output=False, chk_err=False):
+        if cmd.find("which yum") > -1:
+            return 0, ''
+        return -1, ''
+
+    def mock_run_command_for_zypper(self, cmd, no_output=False, chk_err=False):
+        if cmd.find("which zypper") > -1:
+            return 0, ''
+        return -1, ''
+
+    def mock_run_command_for_tdnf(self, cmd, no_output=False, chk_err=False):
+        if cmd.find("which tdnf") > -1:
+            return 0, ''
+        return -1, ''
+    # endregion
+
+    def test_get_package_manager(self):
+        self.backup_platform_system = platform.system()
+        platform.system = self.mock_platform_system
+        self.backup_linux_distribution = self.envlayer.platform.linux_distribution
+        self.envlayer.platform.linux_distribution = self.mock_linux_distribution
+        self.backup_run_command_output = self.envlayer.run_command_output
+
+        test_input_output_table = [
+            [self.mock_run_command_for_apt, self.mock_linux_distribution, Constants.APT],
+            [self.mock_run_command_for_tdnf, self.mock_linux_distribution_to_return_azure_linux, Constants.TDNF],
+            [self.mock_run_command_for_yum, self.mock_linux_distribution_to_return_azure_linux, None],  # check for Azure Linux machine which does not have tdnf
+            [self.mock_run_command_for_yum, self.mock_linux_distribution, Constants.YUM],
+            [self.mock_run_command_for_zypper, self.mock_linux_distribution, Constants.ZYPPER],
+        ]
+
+        for row in test_input_output_table:
+            self.envlayer.run_command_output = row[0]
+            self.envlayer.platform.linux_distribution = row[1]
+            package_manager = self.envlayer.get_package_manager()
+            self.assertTrue(package_manager is row[2])
+
+        self.envlayer.run_command_output = self.backup_run_command_output
+        self.envlayer.platform.linux_distribution = self.backup_linux_distribution
+        platform.system = self.backup_platform_system
+
+
+if __name__ == '__main__':
+    unittest.main()