Skip to content

Rename mock_control_(client|daemon) to control_client_test_driver #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaciejKaszynski merged 2 commits into from
Aug 14, 2026
Merged

Rename mock_control_(client|daemon) to control_client_test_driver #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cfe35f
chore: Rename mock_control_(client|daemon) to control_client_test_driver
Aug 14, 2026
f36efb3
chore: Rename a missed control client
Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/integration/complex_monitoring/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
load("//tests/utils/bazel:integration.bzl", "integration_test")

cc_binary(
name = "control_client_mock",
srcs = ["mock_control_client.cpp"],
name = "control_client_test_driver",
srcs = ["control_client_test_driver.cpp"],
deps = [
"//score/launch_manager:control_cc",
"//score/launch_manager:lifecycle_cc",
Expand Down Expand Up @@ -51,7 +51,7 @@ integration_test(
srcs = ["complex_monitoring.py"],
binaries = [
":component_complex_monitoring",
":control_client_mock",
":control_client_test_driver",
"//score/launch_manager",
"//tests/utils/test_helper:verification_process",
],
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/complex_monitoring/complex_monitoring.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
}
},
"components": {
"control_client_mock": {
"control_client_test_driver": {
"component_properties": {
"binary_name": "control_client_mock",
"binary_name": "control_client_test_driver",
"application_profile": {
"application_type": "State_Manager",
"alive_supervision": {
Expand All @@ -48,7 +48,7 @@
},
"deployment_config": {
"environmental_variables": {
"PROCESSIDENTIFIER": "control_client_mock"
"PROCESSIDENTIFIER": "control_client_test_driver"
}
}
},
Expand Down Expand Up @@ -91,12 +91,12 @@
"run_targets": {
"Startup": {
"depends_on": [
"control_client_mock"
"control_client_test_driver"
]
},
"run_target_complex_monitoring": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"component_complex_monitoring"
],
"recovery_action": {
Expand All @@ -115,7 +115,7 @@
},
"fallback_run_target": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"verification_component"
]
}
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/complex_monitoring/complex_monitoring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,6 @@ def test_complex_monitoring(target, setup_test, assert_test_results, remote_test
timeout_s=4.0,
)

assert_test_results({"component_complex_monitoring.xml", "mock_control_client.xml"})
assert_test_results(
{"component_complex_monitoring.xml", "control_client_test_driver.xml"}
)
0 ...omplex_monitoring/mock_control_client.cpp → ...monitoring/control_client_test_driver.cpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions tests/integration/crash_on_startup/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
load("//tests/utils/bazel:integration.bzl", "integration_test")

cc_binary(
name = "control_client_mock",
srcs = ["mock_control_client.cpp"],
name = "control_client_test_driver",
srcs = ["control_client_test_driver.cpp"],
deps = [
"//score/launch_manager:control_cc",
"//score/launch_manager:lifecycle_cc",
Expand All @@ -28,7 +28,7 @@ integration_test(
name = "crash_on_startup",
srcs = ["crash_on_startup.py"],
binaries = [
":control_client_mock",
":control_client_test_driver",
"//score/launch_manager",
"//tests/utils/test_helper:process_crashing_on_startup_n_times",
"//tests/utils/test_helper:verification_process",
Expand Down
0 .../crash_on_startup/mock_control_client.cpp → ...on_startup/control_client_test_driver.cpp
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions tests/integration/crash_on_startup/crash_on_startup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
}
},
"components": {
"control_client_mock": {
"control_client_test_driver": {
"component_properties": {
"binary_name": "control_client_mock",
"binary_name": "control_client_test_driver",
"application_profile": {
"application_type": "State_Manager",
"alive_supervision": {
Expand All @@ -39,7 +39,7 @@
"ready_timeout": 1.0,
"shutdown_timeout": 1.0,
"environmental_variables": {
"PROCESSIDENTIFIER": "control_client_mock"
"PROCESSIDENTIFIER": "control_client_test_driver"
}
}
},
Expand Down Expand Up @@ -109,24 +109,24 @@
"run_targets": {
"Startup": {
"depends_on": [
"control_client_mock"
"control_client_test_driver"
]
},
"run_target_crash_on_startup_two_times": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"process_crashing_on_startup_twice"
]
},
"run_target_crash_on_startup_three_times": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"process_crashing_on_startup_three_times"
]
},
"run_target_crash_on_startup_once_but_no_retries": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"process_crashing_on_startup_no_retries"
],
"recovery_action": {
Expand All @@ -145,7 +145,7 @@
},
"fallback_run_target": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"verification_component"
]
}
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/crash_on_startup/crash_on_startup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ def test_crash_on_startup(
crash_report_names = {
n: f"process_crashing_on_startup_n_times_n_equals_{n}.xml" for n in (1, 2, 3)
}
assert_test_results({"mock_control_client.xml", *crash_report_names.values()})
assert_test_results(
{"control_client_test_driver.xml", *crash_report_names.values()}
)

# The number of crashes is recorded in each report and must match the configured crash count.
for n, report_name in crash_report_names.items():
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/fallback_to_same_target_restarts/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
load("//tests/utils/bazel:integration.bzl", "integration_test")

cc_binary(
name = "control_client_mock",
srcs = ["mock_control_client.cpp"],
name = "control_client_test_driver",
srcs = ["control_client_test_driver.cpp"],
deps = [
"//score/launch_manager:control_cc",
"//score/launch_manager:lifecycle_cc",
Expand All @@ -39,7 +39,7 @@ integration_test(
srcs = ["fallback_to_same_target_restarts.py"],
binaries = [
":config",
":control_client_mock",
":control_client_test_driver",
":process_crashing_once",
"//score/launch_manager",
],
Expand Down
4 changes: 2 additions & 2 deletions ...e_target_restarts/mock_control_client.cpp → ...t_restarts/control_client_test_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <thread>

// Given a correct configuration with:
// - An initial Run Target named "Startup" containing "control_client_mock"
// - A Run Target named "run_target_crashing_app_on_runtime" containing "control_client_mock" and
// - An initial Run Target named "Startup" containing "control_client_test_driver"
// - A Run Target named "run_target_crashing_app_on_runtime" containing "control_client_test_driver" and
// "component_crashing_once"

TEST(FallbackToSameTargetRestarts, ControlClientMock)
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/fallback_to_same_target_restarts/fallback_to_same_target_restarts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
}
},
"components": {
"control_client_mock": {
"control_client_test_driver": {
"component_properties": {
"binary_name": "control_client_mock",
"binary_name": "control_client_test_driver",
"application_profile": {
"application_type": "State_Manager",
"alive_supervision": {
Expand All @@ -56,7 +56,7 @@
"ready_timeout": 1.0,
"shutdown_timeout": 1.0,
"environmental_variables": {
"PROCESSIDENTIFIER": "control_client_mock"
"PROCESSIDENTIFIER": "control_client_test_driver"
}
}
},
Expand All @@ -78,12 +78,12 @@
"run_targets": {
"Startup": {
"depends_on": [
"control_client_mock"
"control_client_test_driver"
]
},
"run_target_crashing_app_on_runtime": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"component_crashing_once"
],
"recovery_action": {
Expand All @@ -102,7 +102,7 @@
},
"fallback_run_target": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"component_crashing_once"
]
}
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/fallback_to_same_target_restarts/fallback_to_same_target_restarts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ def test_fallback_to_same_target_restarts(
timeout_s=4.0,
)

assert_test_results({"mock_control_client.xml", "process_crashing_once.xml"})
assert_test_results({"control_client_test_driver.xml", "process_crashing_once.xml"})
6 changes: 3 additions & 3 deletions tests/integration/process_complex_rep_failure/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
load("//tests/utils/bazel:integration.bzl", "integration_test")

cc_binary(
name = "control_client_mock",
srcs = ["mock_control_client.cpp"],
name = "control_client_test_driver",
srcs = ["control_client_test_driver.cpp"],
deps = [
"//score/launch_manager:control_cc",
"//score/launch_manager:lifecycle_cc",
Expand All @@ -40,7 +40,7 @@ integration_test(
srcs = ["process_complex_rep_failure.py"],
binaries = [
":complex_reporting_process",
":control_client_mock",
":control_client_test_driver",
"//score/launch_manager",
"//tests/utils/test_helper:verification_process",
],
Expand Down
6 changes: 3 additions & 3 deletions ...mplex_rep_failure/mock_control_client.cpp → ...ep_failure/control_client_test_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

// Given a correct configuration with:
// - An initial Run Target named "Startup" containing component named
// "control_client_mock"
// "control_client_test_driver"
// - A Run Target named "run_target_app_does_report_krunning_in_time"
// containing "control_client_mock" and
// containing "control_client_test_driver" and
// "component_does_report_krunning_in_time"
// - A Run Target named "run_target_app_does_not_report_krunning_in_time"
// containing "control_client_mock" and
// containing "control_client_test_driver" and
// "component_does_not_report_krunning_in_time"

TEST(RecoveryActionComplexRepFailure, ControlClientMock)
Expand Down
14 changes: 7 additions & 7 deletions tests/integration/process_complex_rep_failure/process_complex_rep_failure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
}
},
"components": {
"control_client_mock": {
"control_client_test_driver": {
"component_properties": {
"binary_name": "control_client_mock",
"binary_name": "control_client_test_driver",
"application_profile": {
"application_type": "State_Manager",
"alive_supervision": {
Expand All @@ -56,7 +56,7 @@
"ready_timeout": 1.0,
"shutdown_timeout": 1.0,
"environmental_variables": {
"PROCESSIDENTIFIER": "control_client_mock"
"PROCESSIDENTIFIER": "control_client_test_driver"
}
}
},
Expand Down Expand Up @@ -109,7 +109,7 @@
"run_targets": {
"Startup": {
"depends_on": [
"control_client_mock"
"control_client_test_driver"
],
"recovery_action": {
"switch_run_target": {
Expand All @@ -119,7 +119,7 @@
},
"run_target_app_does_report_krunning_in_time": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"component_does_report_krunning_in_time"
],
"recovery_action": {
Expand All @@ -130,7 +130,7 @@
},
"run_target_app_does_not_report_krunning_in_time": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"component_does_not_report_krunning_in_time"
],
"recovery_action": {
Expand All @@ -149,7 +149,7 @@
},
"fallback_run_target": {
"depends_on": [
"control_client_mock",
"control_client_test_driver",
"verification_component"
]
}
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/process_complex_rep_failure/process_complex_rep_failure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,6 @@ def test_recovery_action_complex_rep_failure(
timeout_s=10.0,
)

assert_test_results({"mock_control_client.xml", "complex_reporting_process.xml"})
assert_test_results(
{"control_client_test_driver.xml", "complex_reporting_process.xml"}
)
6 changes: 3 additions & 3 deletions tests/integration/process_crash_monitoring/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
load("//tests/utils/bazel:integration.bzl", "integration_test")

cc_binary(
name = "control_client_mock",
srcs = ["mock_control_client.cpp"],
name = "control_client_test_driver",
srcs = ["control_client_test_driver.cpp"],
deps = [
"//score/launch_manager:control_cc",
"//score/launch_manager:lifecycle_cc",
Expand All @@ -39,7 +39,7 @@ integration_test(
srcs = ["process_crash_monitoring.py"],
binaries = [
":config",
":control_client_mock",
":control_client_test_driver",
":process_crashing_on_runtime",
"//score/launch_manager",
"//tests/utils/test_helper:verification_process",
Expand Down
4 changes: 2 additions & 2 deletions ..._crash_monitoring/mock_control_client.cpp → ...monitoring/control_client_test_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <thread>

// Given a correct configuration with:
// - An initial Run Target named "Startup" containing "control_client_mock"
// - A Run Target named "run_target_crashing_app_on_runtime" containing "control_client_mock" and
// - An initial Run Target named "Startup" containing "control_client_test_driver"
// - A Run Target named "run_target_crashing_app_on_runtime" containing "control_client_test_driver" and
// "component_crashing_on_runtime"

TEST(ProcessCrashMonitoring, ControlClientMock)
Expand Down
Loading
Loading