Combine message_bridge test configs
A separate client and server config make it hard to test both the
separate timestamp channels and combined timestamp channels.
Change-Id: I0e6a79502d2cd4fb9afe7ae2627bdffb61105da6
diff --git a/aos/network/BUILD b/aos/network/BUILD
index f090e80..15af2b3 100644
--- a/aos/network/BUILD
+++ b/aos/network/BUILD
@@ -311,28 +311,13 @@
deps = ["//aos/events:config"],
)
-aos_config(
- name = "message_bridge_test_server_config",
- src = "message_bridge_test_server.json",
- target_compatible_with = ["@platforms//os:linux"],
- deps = [":message_bridge_test_common_config"],
-)
-
-aos_config(
- name = "message_bridge_test_client_config",
- src = "message_bridge_test_client.json",
- target_compatible_with = ["@platforms//os:linux"],
- deps = [":message_bridge_test_common_config"],
-)
-
cc_test(
name = "message_bridge_test",
srcs = [
"message_bridge_test.cc",
],
data = [
- ":message_bridge_test_client_config",
- ":message_bridge_test_server_config",
+ ":message_bridge_test_common_config",
],
flaky = True,
shard_count = 5,
diff --git a/aos/network/message_bridge_test.cc b/aos/network/message_bridge_test.cc
index ca5bcb8..c8c24cf 100644
--- a/aos/network/message_bridge_test.cc
+++ b/aos/network/message_bridge_test.cc
@@ -34,11 +34,9 @@
class MessageBridgeTest : public ::testing::Test {
public:
- MessageBridgeTest()
- : pi1_config(aos::configuration::ReadConfig(
- "aos/network/message_bridge_test_server_config.json")),
- pi2_config(aos::configuration::ReadConfig(
- "aos/network/message_bridge_test_client_config.json")) {
+ MessageBridgeTest(std::string_view path =
+ "aos/network/message_bridge_test_common_config.json")
+ : config(aos::configuration::ReadConfig(path)) {
util::UnlinkRecursive(ShmBase("pi1"));
util::UnlinkRecursive(ShmBase("pi2"));
}
@@ -57,7 +55,7 @@
OnPi1();
FLAGS_application_name = "pi1_message_bridge_server";
pi1_server_event_loop =
- std::make_unique<aos::ShmEventLoop>(&pi1_config.message());
+ std::make_unique<aos::ShmEventLoop>(&config.message());
pi1_server_event_loop->SetRuntimeRealtimePriority(1);
pi1_message_bridge_server =
std::make_unique<MessageBridgeServer>(pi1_server_event_loop.get());
@@ -96,7 +94,7 @@
OnPi1();
FLAGS_application_name = "pi1_message_bridge_client";
pi1_client_event_loop =
- std::make_unique<aos::ShmEventLoop>(&pi1_config.message());
+ std::make_unique<aos::ShmEventLoop>(&config.message());
pi1_client_event_loop->SetRuntimeRealtimePriority(1);
pi1_message_bridge_client =
std::make_unique<MessageBridgeClient>(pi1_client_event_loop.get());
@@ -121,7 +119,7 @@
OnPi1();
FLAGS_application_name = "test1";
pi1_test_event_loop =
- std::make_unique<aos::ShmEventLoop>(&pi1_config.message());
+ std::make_unique<aos::ShmEventLoop>(&config.message());
pi1_test_event_loop->MakeWatcher(
"/pi1/aos", [](const ServerStatistics &stats) {
@@ -155,7 +153,7 @@
OnPi2();
FLAGS_application_name = "pi2_message_bridge_server";
pi2_server_event_loop =
- std::make_unique<aos::ShmEventLoop>(&pi2_config.message());
+ std::make_unique<aos::ShmEventLoop>(&config.message());
pi2_server_event_loop->SetRuntimeRealtimePriority(1);
pi2_message_bridge_server =
std::make_unique<MessageBridgeServer>(pi2_server_event_loop.get());
@@ -194,7 +192,7 @@
OnPi2();
FLAGS_application_name = "pi2_message_bridge_client";
pi2_client_event_loop =
- std::make_unique<aos::ShmEventLoop>(&pi2_config.message());
+ std::make_unique<aos::ShmEventLoop>(&config.message());
pi2_client_event_loop->SetRuntimeRealtimePriority(1);
pi2_message_bridge_client =
std::make_unique<MessageBridgeClient>(pi2_client_event_loop.get());
@@ -234,7 +232,7 @@
OnPi2();
FLAGS_application_name = "test2";
pi2_test_event_loop =
- std::make_unique<aos::ShmEventLoop>(&pi2_config.message());
+ std::make_unique<aos::ShmEventLoop>(&config.message());
pi2_test_event_loop->MakeWatcher(
"/pi2/aos", [](const ServerStatistics &stats) {
@@ -264,8 +262,7 @@
pi2_test_thread.join();
}
- aos::FlatbufferDetachedBuffer<aos::Configuration> pi1_config;
- aos::FlatbufferDetachedBuffer<aos::Configuration> pi2_config;
+ aos::FlatbufferDetachedBuffer<aos::Configuration> config;
std::unique_ptr<aos::ShmEventLoop> pi1_server_event_loop;
std::unique_ptr<MessageBridgeServer> pi1_message_bridge_server;
@@ -320,11 +317,11 @@
// And build the app which sends the pings.
FLAGS_application_name = "ping";
- aos::ShmEventLoop ping_event_loop(&pi1_config.message());
+ aos::ShmEventLoop ping_event_loop(&config.message());
aos::Sender<examples::Ping> ping_sender =
ping_event_loop.MakeSender<examples::Ping>("/test");
- aos::ShmEventLoop pi1_test_event_loop(&pi1_config.message());
+ aos::ShmEventLoop pi1_test_event_loop(&config.message());
aos::Fetcher<RemoteMessage> message_header_fetcher1 =
pi1_test_event_loop.MakeFetcher<RemoteMessage>(
"/pi1/aos/remote_timestamps/pi2");
@@ -343,11 +340,11 @@
// And build the app which sends the pongs.
FLAGS_application_name = "pong";
- aos::ShmEventLoop pong_event_loop(&pi2_config.message());
+ aos::ShmEventLoop pong_event_loop(&config.message());
// And build the app for testing.
FLAGS_application_name = "test";
- aos::ShmEventLoop test_event_loop(&pi2_config.message());
+ aos::ShmEventLoop test_event_loop(&config.message());
aos::Fetcher<ClientStatistics> client_statistics_fetcher =
test_event_loop.MakeFetcher<ClientStatistics>("/aos");
@@ -357,7 +354,7 @@
// Event loop for fetching data delivered to pi2 from pi1 to match up
// messages.
- aos::ShmEventLoop delivered_messages_event_loop(&pi2_config.message());
+ aos::ShmEventLoop delivered_messages_event_loop(&config.message());
aos::Fetcher<Timestamp> pi1_on_pi2_timestamp_fetcher =
delivered_messages_event_loop.MakeFetcher<Timestamp>("/pi1/aos");
aos::Fetcher<examples::Ping> ping_on_pi2_fetcher =
@@ -939,7 +936,7 @@
OnPi1();
FLAGS_application_name = "sender";
- aos::ShmEventLoop send_event_loop(&pi1_config.message());
+ aos::ShmEventLoop send_event_loop(&config.message());
aos::Sender<examples::Ping> ping_sender =
send_event_loop.MakeSender<examples::Ping>("/test");
SendPing(&ping_sender, 1);
@@ -951,14 +948,14 @@
MakePi1Client();
FLAGS_application_name = "pi1_timestamp";
- aos::ShmEventLoop pi1_remote_timestamp_event_loop(&pi1_config.message());
+ aos::ShmEventLoop pi1_remote_timestamp_event_loop(&config.message());
// Now do it for "raspberrypi2", the client.
OnPi2();
MakePi2Server();
- aos::ShmEventLoop receive_event_loop(&pi2_config.message());
+ aos::ShmEventLoop receive_event_loop(&config.message());
aos::Fetcher<examples::Ping> ping_fetcher =
receive_event_loop.MakeFetcher<examples::Ping>("/test");
aos::Fetcher<examples::Ping> unreliable_ping_fetcher =
@@ -1058,7 +1055,7 @@
MakePi2Server();
MakePi2Client();
- aos::ShmEventLoop receive_event_loop(&pi2_config.message());
+ aos::ShmEventLoop receive_event_loop(&config.message());
aos::Fetcher<examples::Ping> ping_fetcher =
receive_event_loop.MakeFetcher<examples::Ping>("/test");
aos::Fetcher<examples::Ping> unreliable_ping_fetcher =
@@ -1070,7 +1067,7 @@
OnPi1();
FLAGS_application_name = "sender";
- aos::ShmEventLoop send_event_loop(&pi1_config.message());
+ aos::ShmEventLoop send_event_loop(&config.message());
aos::Sender<examples::Ping> ping_sender =
send_event_loop.MakeSender<examples::Ping>("/test");
{
@@ -1084,7 +1081,7 @@
MakePi1Client();
FLAGS_application_name = "pi1_timestamp";
- aos::ShmEventLoop pi1_remote_timestamp_event_loop(&pi1_config.message());
+ aos::ShmEventLoop pi1_remote_timestamp_event_loop(&config.message());
const size_t ping_channel_index = configuration::ChannelIndex(
receive_event_loop.configuration(), ping_fetcher.channel());
diff --git a/aos/network/message_bridge_test_client.json b/aos/network/message_bridge_test_client.json
deleted file mode 100644
index d748225..0000000
--- a/aos/network/message_bridge_test_client.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "imports": [
- "message_bridge_test_common.json"
- ],
- "nodes": [
- {
- "name": "pi1",
- "hostname": "localhost",
- "port": 9971
- },
- {
- "name": "pi2",
- "hostname": "raspberrypi2",
- "port": 9972
- }
- ]
-}
diff --git a/aos/network/message_bridge_test_common.json b/aos/network/message_bridge_test_common.json
index 2b89080..74c932d 100644
--- a/aos/network/message_bridge_test_common.json
+++ b/aos/network/message_bridge_test_common.json
@@ -162,5 +162,19 @@
"name": "/pi2/aos"
}
}
+ ],
+ "nodes": [
+ {
+ "name": "pi1",
+ "hostname": "localhost",
+ "hostnames": ["raspberrypi"],
+ "port": 9971
+ },
+ {
+ "name": "pi2",
+ "hostname": "localhost",
+ "hostnames": ["raspberrypi2"],
+ "port": 9972
+ }
]
}
diff --git a/aos/network/message_bridge_test_server.json b/aos/network/message_bridge_test_server.json
deleted file mode 100644
index 35cedb6..0000000
--- a/aos/network/message_bridge_test_server.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "imports": [
- "message_bridge_test_common.json"
- ],
- "nodes": [
- {
- "name": "pi1",
- "hostname": "raspberrypi",
- "port": 9971
- },
- {
- "name": "pi2",
- "hostname": "localhost",
- "port": 9972
- }
- ]
-}