Add timed test suite wrapper macros for process_watchdog integration #520

parth21999 · 2026-01-21T00:39:28Z

Summary

Add TIMED_TEST_SUITE_INITIALIZE and TIMED_TEST_SUITE_CLEANUP macros in common/inc/c_pal/timed_test_suite.h
Provides automatic timeout protection for integration tests using process_watchdog
Watchdog init runs BEFORE user suite init code
Watchdog deinit runs AFTER user suite cleanup code
Add unit tests to verify fixture ordering

Dependencies

Requires Add variadic fixture support to TEST_SUITE_* macros c-testrunnerswitcher#271 for variadic fixture support

Types are now provided by windows.h which is always included first.

into test-watchdog-impl-impl

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

parth21999 · 2026-01-21T00:50:34Z

/AzurePipelines run #Resolved

azure-pipelines · 2026-01-21T00:50:46Z

Azure Pipelines successfully started running 1 pipeline(s). #Resolved

parth21999 · 2026-01-21T01:32:30Z

/AzurePipelines run #Resolved

azure-pipelines · 2026-01-21T01:32:46Z

Azure Pipelines successfully started running 1 pipeline(s). #Resolved

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

parth21999 · 2026-01-21T02:37:09Z

/AzurePipelines run #Resolved

azure-pipelines · 2026-01-21T02:37:23Z

Azure Pipelines successfully started running 1 pipeline(s). #Resolved

parth21999 · 2026-01-21T02:41:29Z

/AzurePipelines run #Resolved

azure-pipelines · 2026-01-21T02:41:39Z

Azure Pipelines successfully started running 1 pipeline(s). #Resolved

mattdurak · 2026-01-21T19:11:33Z

common/tests/CMakeLists.txt

    build_test_folder(thandle_ptr_ut)
    build_test_folder(real_thandle_log_context_handle_ut)
    build_test_folder(tqueue_ut)
+    add_subdirectory(timed_test_suite_ut)


add_subdirectory

Maybe should have a comment that it intentionally doesn't use c-testrunnerswitcher #Closed

Changed to use c-testrunnerswitcher.

mattdurak · 2026-01-21T19:12:03Z

common/tests/timed_test_suite_ut/main.c

+    if (timed_test_suite_ut_succeeded() != 0)
+    {
+        // Final validation of fixture ordering has failed
+        failedTests++;


can we Log something here? #Resolved

mattdurak · 2026-01-21T19:14:19Z

common/tests/CMakeLists.txt

+    add_subdirectory(timed_test_suite_ut)
 endif()

 if(${run_int_tests})


Consider an int test that demonstrates the timeout works. I guess since the process_watchdog will terminate, the test would probably need to launch that process and make sure it gets terminated within the timeout (+ delta) #Resolved

Added int test.

mattdurak

dcristoloveanu · 2026-01-21T19:19:08Z

common/tests/timed_test_suite_ut/timed_test_suite_ut.c

+static int call_counter = 0;
+
+// Mock process_watchdog functions
+int process_watchdog_init(uint32_t timeout_ms)


process_watchdog_init

Wait, where is this used? #Resolved

This is called inside TIMED_TEST_SUITE_INITIALIZE macro.

Added specs and comment.

azure-pipelines · 2026-01-22T01:39:22Z

Azure Pipelines successfully started running 1 pipeline(s).

parth21999 · 2026-01-22T01:48:14Z

win32/tests/process_watchdog_int/process_watchdog_int.c

+
+    // The child should NOT have exited cleanly (it was terminated by watchdog)
+    // On Windows, LogCriticalAndTerminate calls TerminateProcess which can give various exit codes
+    ASSERT_ARE_NOT_EQUAL(int, CHILD_EXIT_CODE_SURVIVED_TIMEOUT, exit_code,


That's not true, it calls abort(). #Resolved

parth21999 · 2026-01-22T01:49:23Z

linux/tests/process_watchdog_int/process_watchdog_int.c

+    ASSERT_IS_NOT_NULL(dir);
+    int snprintf_result = snprintf(buffer, buffer_size, "%s/../process_watchdog_int_child/process_watchdog_int_child", dir);
+    ASSERT_IS_TRUE(snprintf_result > 0 && (size_t)snprintf_result < buffer_size);
+}


Add comment explaining this. in windows too. #Resolved

parth21999 · 2026-01-22T01:54:07Z

linux/tests/process_watchdog_int/process_watchdog_int.c

+    {
+        // Child process - exec the test program
+        char timeout_str[32];
+        (void)snprintf(timeout_str, sizeof(timeout_str), "%" PRIu32, timeout_ms);


(void)snprin

Can this be asserted? #Resolved

parth21999 · 2026-01-22T01:54:20Z

linux/tests/process_watchdog_int/process_watchdog_int.c

+        execl(exe_path, exe_path, timeout_str, NULL);
+
+        // If execl returns, it failed
+        (void)fprintf(stderr, "execl failed: %s\n", strerror(errno));


(void)

Can this be asserted. #Resolved

parth21999 · 2026-01-22T01:55:59Z

linux/tests/process_watchdog_int/process_watchdog_int.c

+            LogError("waitpid failed with error: %s", strerror(errno));
+            result = -1;
+        }
+        else if (WIFEXITED(status))


WIFEXITED

Add one line comments explaining what platform APIs are doing.

In windows too.

Test should be self documenting. #Resolved

…ests - Fix comment: watchdog calls abort(), not TerminateProcess - Add comments explaining WIFEXITED/WIFSIGNALED/WTERMSIG on Linux - Add comments explaining WaitForSingleObject/GetExitCodeProcess on Windows - Add comments explaining get_child_exe_path path construction logic - Add snprintf error handling in forked child (can't use ASSERT in child) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

parth21999 · 2026-01-22T02:05:20Z

/AzurePipelines run

azure-pipelines · 2026-01-22T02:05:32Z

Azure Pipelines successfully started running 1 pipeline(s).

parth21999 · 2026-01-22T02:10:59Z

win32/tests/process_watchdog_int/process_watchdog_int.c

+        "Process terminated too late: %.0f ms > %d ms", elapsed_ms, WATCHDOG_TIMEOUT_MS + TOLERANCE_MS);
+
+    // The child should NOT have exited cleanly (it was terminated by watchdog)
+    // On Windows, the watchdog calls abort() which terminates the process


// On Windows, the watchdog calls abort() which terminates the process

This comment is not necessary any more, remove it. In linux too. #Resolved

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

parth21999 · 2026-01-22T02:14:41Z

/AzurePipelines run

azure-pipelines · 2026-01-22T02:14:47Z

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

parth21999 · 2026-01-22T02:23:15Z

/AzurePipelines run

azure-pipelines · 2026-01-22T02:23:21Z

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

parth21999 · 2026-01-22T02:23:52Z

/AzurePipelines run

azure-pipelines · 2026-01-22T02:24:02Z

Azure Pipelines successfully started running 1 pipeline(s).

dcristoloveanu · 2026-01-22T23:14:22Z

common/inc/c_pal/timed_test_suite.h

+/*Codes_SRS_TIMED_TEST_SUITE_43_003: [ TIMED_TEST_SUITE_INITIALIZE shall call TEST_SUITE_INITIALIZE with the watchdog init fixture as the first fixture, followed by any additional fixtures passed via variadic arguments. ]*/
+/*Codes_SRS_TIMED_TEST_SUITE_43_004: [ The watchdog init fixture shall execute before the user's initialization code. ]*/
+#define TIMED_TEST_SUITE_INITIALIZE(name, timeout_ms, ...) \
+    static void MU_C2(timed_test_watchdog_init_, name)(void) { (void)process_watchdog_init(timeout_ms); } \


(void)

Should we not assert this?

dcristoloveanu · 2026-01-22T23:19:17Z

linux/tests/process_watchdog_int/process_watchdog_int.c

+{
+    int result;
+
+    LogInfo("Launching child process: %s %" PRIu32, exe_path, timeout_ms);


2, e

Should have an "" at the end after PRIu32

dcristoloveanu · 2026-01-22T23:19:32Z

linux/tests/process_watchdog_int/process_watchdog_int.c

+    pid_t pid = fork();
+    if (pid < 0)
+    {
+        LogError("fork failed with error: %s", strerror(errno));


LogError

Don't we have a special LogErrorNo?

dcristoloveanu · 2026-01-22T23:19:51Z

linux/tests/process_watchdog_int/process_watchdog_int.c

+        if (snprintf_result < 0 || (size_t)snprintf_result >= sizeof(timeout_str))
+        {
+            (void)fprintf(stderr, "snprintf failed for timeout_ms\n");
+            _exit(126);


126

Why 126? Maybe use MU_FAILURE?

dcristoloveanu · 2026-01-22T23:20:02Z

linux/tests/process_watchdog_int/process_watchdog_int.c

+        }
+        else
+        {
+            execl(exe_path, exe_path, timeout_str, NULL);


execl

Doesn't this return something?

dcristoloveanu · 2026-01-22T23:20:14Z

linux/tests/process_watchdog_int/process_watchdog_int.c

+            execl(exe_path, exe_path, timeout_str, NULL);
+
+            // If execl returns, it failed. fprintf return value is ignored since we're exiting immediately
+            (void)fprintf(stderr, "execl failed: %s\n", strerror(errno));


fprintf

Why not LogError?

dcristoloveanu · 2026-01-22T23:22:31Z

linux/tests/process_watchdog_int_child/process_watchdog_int_child.c

+
+                // Sleep longer than the timeout - the watchdog should terminate us
+                uint32_t sleep_time_ms = timeout_ms * 2;
+                usleep(sleep_time_ms * 1000);


usleep

Why not use the ThareadAPI_SLeep?

dcristoloveanu · 2026-01-22T23:23:16Z

win32/tests/process_watchdog_int_child/process_watchdog_int_child.c

+        }
+        else
+        {
+            uint32_t timeout_ms = (uint32_t)atoi(argv[1]);


argv[1]

Is this guaranteed to be non NULL?

dcristoloveanu · 2026-01-22T23:23:27Z

win32/tests/process_watchdog_int_child/process_watchdog_int_child.c

+
+                // Sleep longer than the timeout - the watchdog should terminate us
+                uint32_t sleep_time_ms = timeout_ms * 2;
+                Sleep(sleep_time_ms);


Sleep

ThreadAPI_SLeep

dcristoloveanu

mattdurak · 2026-01-22T23:38:47Z

win32/tests/process_watchdog_int/process_watchdog_int.c

+    // Navigate up one level (..) then into the child test directory
+    int snprintf_result = snprintf(buffer, buffer_size, "%s\\..\\process_watchdog_int_child\\process_watchdog_int_child.exe", module_path);
+    ASSERT_IS_TRUE(snprintf_result > 0 && (size_t)snprintf_result < buffer_size);
+}


consider just setting the exe as a dependency in cmake (which is better anyway so you can't build this test without the dependent exe) and then the exe ends up in the same directory as the test (so no directory navigation needed here)

Seems the dependency is added, so the exe should be present in the current directory

mattdurak · 2026-01-22T23:40:20Z

linux/tests/process_watchdog_int/process_watchdog_int.c

+    // Navigate up one level (..) then into the child test directory
+    int snprintf_result = snprintf(buffer, buffer_size, "%s/../process_watchdog_int_child/process_watchdog_int_child", dir);
+    ASSERT_IS_TRUE(snprintf_result > 0 && (size_t)snprintf_result < buffer_size);
+}


same comment as in windows that this should just be in the current directory already

parth21999 and others added 14 commits January 13, 2026 14:38

header and specs

d3a8e05

renumber specs

ecbbafd

wip

766ca7c

wip

8fc7829

wip

50c3742

wip

d3a0aa2

fix linux

ed9c387

implement module

2a82c10

Merge branch 'master' into test-watchdog-impl-impl

d71acec

remove duplicate type definitions from mock_threadpool_timer.h

eeb3ba4

Types are now provided by windows.h which is always included first.

Merge branch 'test-watchdog-impl-impl' of https://github.com/Azure/c-pal

d866a3c

into test-watchdog-impl-impl

undo unnecessary changes

4ef4dd3

Merge branch 'master' into test-watchdog-impl-impl

8f3d48c

Add timed test suite wrapper macros for process_watchdog integration

ad00bbe

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

microsoft-github-policy-service bot requested a review from anporumb January 21, 2026 00:39

try with non-master c-testrunnerswitcher

4b86644

Update c-testrunnerswitcher to include variadic fixture support

8129d99

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

mattdurak reviewed Jan 21, 2026

View reviewed changes

mattdurak previously approved these changes Jan 21, 2026

View reviewed changes

dcristoloveanu reviewed Jan 21, 2026

View reviewed changes

parth21999 commented Jan 22, 2026

View reviewed changes

Remove unnecessary abort() comments from integration tests

c54bafc

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Merge origin/master with process_watchdog implementation

c25afd4

dcristoloveanu reviewed Jan 22, 2026

View reviewed changes

dcristoloveanu approved these changes Jan 22, 2026

View reviewed changes

mattdurak reviewed Jan 22, 2026

View reviewed changes

Add timed test suite wrapper macros for process_watchdog integration #520

Are you sure you want to change the base?

Add timed test suite wrapper macros for process_watchdog integration #520

Conversation

parth21999 commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Dependencies

Uh oh!

parth21999 commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

azure-pipelines bot commented Jan 21, 2026 • edited by parth21999 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

parth21999 commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

azure-pipelines bot commented Jan 21, 2026 • edited by parth21999 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

parth21999 commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

azure-pipelines bot commented Jan 21, 2026 • edited by parth21999 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

parth21999 commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

azure-pipelines bot commented Jan 21, 2026 • edited by parth21999 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mattdurak Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattdurak Jan 21, 2026 • edited by parth21999 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattdurak Jan 21, 2026 • edited by parth21999 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattdurak left a comment

Choose a reason for hiding this comment

Uh oh!

dcristoloveanu Jan 21, 2026 • edited by parth21999 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

azure-pipelines bot commented Jan 22, 2026

Uh oh!

parth21999 Jan 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parth21999 Jan 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parth21999 Jan 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parth21999 Jan 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parth21999 commented Jan 21, 2026 •

edited

Loading

parth21999 commented Jan 21, 2026 •

edited

Loading

azure-pipelines bot commented Jan 21, 2026 •

edited by parth21999

Loading

parth21999 commented Jan 21, 2026 •

edited

Loading

azure-pipelines bot commented Jan 21, 2026 •

edited by parth21999

Loading

parth21999 commented Jan 21, 2026 •

edited

Loading

azure-pipelines bot commented Jan 21, 2026 •

edited by parth21999

Loading

parth21999 commented Jan 21, 2026 •

edited

Loading

azure-pipelines bot commented Jan 21, 2026 •

edited by parth21999

Loading

mattdurak Jan 21, 2026 •

edited

Loading

mattdurak Jan 21, 2026 •

edited by parth21999

Loading

mattdurak Jan 21, 2026 •

edited by parth21999

Loading

dcristoloveanu Jan 21, 2026 •

edited by parth21999

Loading

parth21999 Jan 22, 2026 •

edited

Loading

parth21999 Jan 22, 2026 •

edited

Loading

parth21999 Jan 22, 2026 •

edited

Loading

parth21999 Jan 22, 2026 •

edited

Loading

parth21999 Jan 22, 2026 •

edited

Loading

parth21999 Jan 22, 2026 •

edited

Loading