Consistently report error in tests. (#10453)

This commit is contained in:
Jiaming Yuan
2024-06-21 14:35:22 +08:00
committed by GitHub
parent b38c7fe2ce
commit 26eb68859f
12 changed files with 32 additions and 32 deletions

View File

@@ -117,7 +117,7 @@ class Worker : public WorkerForTest {
common::Span{sizes.data(), sizes.size()},
common::Span{recv_segments.data(), recv_segments.size()},
common::EraseType(s_recv), AllgatherVAlgo::kBcast);
ASSERT_TRUE(rc.OK());
SafeColl(rc);
CheckV(s_recv);
// Test inplace
@@ -130,7 +130,7 @@ class Worker : public WorkerForTest {
common::Span{sizes.data(), sizes.size()},
common::Span{recv_segments.data(), recv_segments.size()},
common::EraseType(s_recv), algo);
ASSERT_TRUE(rc.OK());
SafeColl(rc);
CheckV(s_recv);
};

View File

@@ -24,7 +24,7 @@ class AllreduceWorker : public WorkerForTest {
rhs[i] += lhs[i];
}
});
ASSERT_TRUE(rc.OK());
SafeColl(rc);
ASSERT_EQ(std::accumulate(data.cbegin(), data.cend(), 0.0), 0.0);
}
{
@@ -34,7 +34,7 @@ class AllreduceWorker : public WorkerForTest {
rhs[i] += lhs[i];
}
});
ASSERT_TRUE(rc.OK());
SafeColl(rc);
ASSERT_EQ(data[0], static_cast<double>(comm_.World()));
}
}
@@ -49,7 +49,7 @@ class AllreduceWorker : public WorkerForTest {
rhs[i] += lhs[i];
}
});
ASSERT_TRUE(rc.OK());
SafeColl(rc);
for (auto v : data) {
ASSERT_EQ(v, comm_.World());
}
@@ -62,7 +62,7 @@ class AllreduceWorker : public WorkerForTest {
rhs[i] += lhs[i];
}
});
ASSERT_TRUE(rc.OK());
SafeColl(rc);
for (std::size_t i = 0; i < data.size(); ++i) {
auto v = data[i];
ASSERT_EQ(v, 1.5 * static_cast<double>(comm_.World())) << i;

View File

@@ -41,7 +41,7 @@ TEST_F(TrackerAPITest, CAPI) {
auto args = Json::Load(StringView{cargs});
std::string host;
ASSERT_TRUE(GetHostAddress(&host).OK());
SafeColl(GetHostAddress(&host));
ASSERT_EQ(host, get<String const>(args["dmlc_tracker_uri"]));
auto port = get<Integer const>(args["dmlc_tracker_port"]);
ASSERT_NE(port, 0);

View File

@@ -47,6 +47,6 @@ TEST_F(CommTest, Channel) {
w.join();
}
ASSERT_TRUE(fut.get().OK());
SafeColl(fut.get());
}
} // namespace xgboost::collective

View File

@@ -70,7 +70,7 @@ TEST_F(SocketTest, Bind) {
auto sock = TCPSocket::Create(domain);
std::int32_t port{0};
auto rc = sock.Bind(any, &port);
ASSERT_TRUE(rc.OK());
SafeColl(rc);
ASSERT_NE(port, 0);
};

View File

@@ -59,7 +59,7 @@ TEST_F(TrackerTest, Print) {
std::vector<std::thread> workers;
auto rc = tracker.WaitUntilReady();
ASSERT_TRUE(rc.OK());
SafeColl(rc);
std::int32_t port = tracker.Port();
@@ -74,7 +74,7 @@ TEST_F(TrackerTest, Print) {
w.join();
}
ASSERT_TRUE(fut.get().OK());
SafeColl(fut.get());
}
TEST_F(TrackerTest, GetHostAddress) { ASSERT_TRUE(host.find("127.") == std::string::npos); }
@@ -88,7 +88,7 @@ TEST_F(TrackerTest, AfterShutdown) {
std::vector<std::thread> workers;
auto rc = tracker.WaitUntilReady();
ASSERT_TRUE(rc.OK());
SafeColl(rc);
std::int32_t port = tracker.Port();
@@ -101,7 +101,7 @@ TEST_F(TrackerTest, AfterShutdown) {
w.join();
}
ASSERT_TRUE(fut.get().OK());
SafeColl(fut.get());
// Launch workers again, they should fail.
workers.clear();

View File

@@ -50,8 +50,8 @@ class WorkerForTest {
for (std::int32_t i = 0; i < comm_.World(); ++i) {
if (i != comm_.Rank()) {
ASSERT_TRUE(comm_.Chan(i)->Socket()->NonBlocking());
ASSERT_TRUE(comm_.Chan(i)->Socket()->SetBufSize(n_bytes).OK());
ASSERT_TRUE(comm_.Chan(i)->Socket()->SetNoDelay().OK());
SafeColl(comm_.Chan(i)->Socket()->SetBufSize(n_bytes));
SafeColl(comm_.Chan(i)->Socket()->SetNoDelay());
}
}
}
@@ -131,7 +131,7 @@ void TestDistributed(std::int32_t n_workers, WorkerFn worker_fn) {
t.join();
}
ASSERT_TRUE(fut.get().OK());
SafeColl(fut.get());
}
inline auto MakeDistributedTestConfig(std::string host, std::int32_t port,
@@ -182,7 +182,7 @@ void TestDistributedGlobal(std::int32_t n_workers, WorkerFn worker_fn, bool need
t.join();
}
ASSERT_TRUE(fut.get().OK());
SafeColl(fut.get());
system::SocketFinalize();
}