Bugfix: Fix Failing UT missing credential sanitizer (#376)

Similar Issue and Fix :
#374

Its weird because I see failure in one of my PR run :
#368
<img width="987" height="352" alt="UTFIx_1"
src="https://github.com/user-attachments/assets/74e2aedf-325f-4ec6-beb7-238ff4152de5"
/>

and the 2nd one looks fine after the same rebase :
#359

The addition of credential sanitizer has started exercising new paths
which is reducing the coverage from base branch.
- I've removed the test that were marked to skip on GitHub because they
kept failing according to this PR :
#129 . ( No comment was
mentioned about putting it back or reasoning either)
- Added sleep time 20s and 30s each for update time use-case which was
failing on assertion due to time not getting reflected or writes
happening before/around the same time.
Dont see any failures at the moment with the github tests that were
failing earlier.

Author: yashnap

src/extension/tests/Test_ActionHandler.py

@@ -310,7 +310,7 @@ def mock_os_getenv(name, value=None):
 
         # Re-init TelemetryWriter since the env var for compatibility is only checked on init
         os.getenv = mock_os_getenv
-        self.runtime.telemetry_writer = TelemetryWriter(self.runtime.logger, self.runtime.env_layer)
+        self.runtime.telemetry_writer = TelemetryWriter(self.runtime.logger, self.runtime.env_layer, self.runtime.credential_sanitizer)
         self.action_handler.telemetry_writer = self.runtime.telemetry_writer
 
         self.assertTrue(self.action_handler.uninstall() == Constants.ExitCode.Okay)
@@ -339,7 +339,7 @@ def mock_os_getenv(name, value=None):
 
         # Re-init TelemetryWriter since the env var for compatibility is only checked on init
         os.getenv = mock_os_getenv
-        self.runtime.telemetry_writer = TelemetryWriter(self.runtime.logger, self.runtime.env_layer)
+        self.runtime.telemetry_writer = TelemetryWriter(self.runtime.logger, self.runtime.env_layer, self.runtime.credential_sanitizer)
         self.action_handler.telemetry_writer = self.runtime.telemetry_writer
 
         self.assertTrue(self.action_handler.uninstall() == Constants.ExitCode.Okay)
@@ -582,7 +582,7 @@ def test_filter_files_from_versions(self):
             '/var/lib/waagent/Microsoft.CPlat.Core.LinuxPatchExtension-1.6.35'
         ]
 
-        all_versions = self.action_handler.filter_files_from_versions(all_versions_including_files);
+        all_versions = self.action_handler.filter_files_from_versions(all_versions_including_files)
         self.assertTrue(len(all_versions) == 2)
         self.assertTrue('/var/lib/waagent/Microsoft.CPlat.Core.LinuxPatchExtension-1.6.36' in all_versions)
         self.assertTrue('/var/lib/waagent/Microsoft.CPlat.Core.LinuxPatchExtension-1.6.35' in all_versions)

src/extension/tests/Test_ExtOutputStatusHandler.py

@@ -18,6 +18,7 @@
 import os
 import shutil
 import tempfile
+import time
 import unittest
 from extension.src.Constants import Constants
 from extension.src.file_handlers.ExtOutputStatusHandler import ExtOutputStatusHandler
@@ -72,9 +73,6 @@ def test_read_file(self):
         shutil.rmtree(dir_path)
 
     def test_update_file(self):
-        if self.runtime.is_github_runner:
-            return
-
         file_name = "test"
         dir_path = tempfile.mkdtemp()
         operation = "Assessment"
@@ -84,11 +82,13 @@ def test_update_file(self):
         stat_file_name = os.stat(os.path.join(dir_path, file_name + ".status"))
         prev_modified_time = stat_file_name.st_mtime
 
+        time.sleep(0.02)
         ext_status_handler.update_file("test1")
         stat_file_name = os.stat(os.path.join(dir_path, file_name + ".status"))
         modified_time = stat_file_name.st_mtime
         self.assertEqual(prev_modified_time, modified_time)
 
+        time.sleep(0.03)  # ensure filesystem mtime granularity is exceeded
         ext_status_handler.update_file(file_name)
         stat_file_name = os.stat(os.path.join(dir_path, file_name + ".status"))
         modified_time = stat_file_name.st_mtime

src/extension/tests/Test_TelemetryWriter.py

@@ -38,9 +38,6 @@ def mock_os_listdir(self, file_path):
         return ['testevent1.json', 'testevent2.json', 'testevent3.json', 'testevent4.json']
 
     def test_write_event(self):
-        if self.runtime.is_github_runner:
-            return
-
         self.telemetry_writer.write_event("testing telemetry write to file", Constants.TelemetryEventLevel.Error, "Test Task")
         with open(os.path.join(self.telemetry_writer.events_folder_path, os.listdir(self.telemetry_writer.events_folder_path)[0]), 'r+') as f:
             events = json.load(f)
@@ -64,17 +61,14 @@ def test_write_event(self):
                 f.close()
 
     def test_write_multiple_events_in_same_file(self):
-        if self.runtime.is_github_runner:
-            return
-
         time_backup = time.time
         time.time = self.mock_time
         self.telemetry_writer.write_event("testing telemetry write to file", Constants.TelemetryEventLevel.Error, "Test Task")
         self.telemetry_writer.write_event("testing telemetry write to file", Constants.TelemetryEventLevel.Error, "Test Task2")
         with open(os.path.join(self.telemetry_writer.events_folder_path, os.listdir(self.telemetry_writer.events_folder_path)[0]), 'r+') as f:
             events = json.load(f)
             self.assertTrue(events is not None)
-            self.assertEqual(len(events), 2)  # Fails here on GitHub
+            self.assertEqual(len(events), 2)
             self.assertEqual(events[0]["TaskName"], "Test Task")
             self.assertEqual(events[1]["TaskName"], "Test Task2")
             f.close()
@@ -115,9 +109,6 @@ def test_write_event_size_limit(self):
     #     self.telemetry_writer.get_file_size = telemetry_get_event_file_size_backup
 
     def test_delete_older_events(self):
-        if self.runtime.is_github_runner:
-            return
-
         # deleting older event files before adding new one
         self.telemetry_writer.write_event("testing telemetry write to file", Constants.TelemetryEventLevel.Error, "Test Task")
         self.telemetry_writer.write_event("testing telemetry write to file", Constants.TelemetryEventLevel.Error, "Test Task2")
@@ -131,7 +122,7 @@ def test_delete_older_events(self):
         self.telemetry_writer.write_event("testing telemetry write to file", Constants.TelemetryEventLevel.Error, "Test Task4")
         new_events = os.listdir(self.telemetry_writer.events_folder_path)
         self.assertEqual(len(new_events), 1)
-        self.assertTrue(old_events[0] not in new_events)  # Fails here on GitHub
+        self.assertNotIn(old_events[0], new_events)
         Constants.TELEMETRY_DIR_SIZE_LIMIT_IN_CHARS = telemetry_dir_size_backup
         Constants.TELEMETRY_EVENT_FILE_SIZE_LIMIT_IN_CHARS = telemetry_event_size_backup