Skip to content

Commit 64afe98

Browse files
authored
Increase timeout in C++ tests from 1 to 5 seconds. (dmlc#10756)
To avoid CI failures on FreeBSD.
1 parent bde1265 commit 64afe98

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

tests/cpp/collective/test_worker.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ template <typename WorkerFn>
151151
void TestDistributedGlobal(std::int32_t n_workers, WorkerFn worker_fn, bool need_finalize = true,
152152
std::chrono::seconds test_timeout = std::chrono::seconds{30}) {
153153
system::SocketStartup();
154-
std::chrono::seconds timeout{1};
154+
std::chrono::seconds poll_timeout{5};
155155

156156
std::string host;
157157
auto rc = GetHostAddress(&host);
158158
SafeColl(rc);
159159

160-
RabitTracker tracker{MakeTrackerConfig(host, n_workers, timeout)};
160+
RabitTracker tracker{MakeTrackerConfig(host, n_workers, poll_timeout)};
161161
auto fut = tracker.Run();
162162

163163
std::vector<std::thread> workers;
@@ -166,7 +166,7 @@ void TestDistributedGlobal(std::int32_t n_workers, WorkerFn worker_fn, bool need
166166
for (std::int32_t i = 0; i < n_workers; ++i) {
167167
workers.emplace_back([=] {
168168
auto fut = std::async(std::launch::async, [=] {
169-
auto config = MakeDistributedTestConfig(host, port, timeout, i);
169+
auto config = MakeDistributedTestConfig(host, port, poll_timeout, i);
170170
Init(config);
171171
worker_fn();
172172
if (need_finalize) {

tests/cpp/common/test_quantile.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,22 +283,22 @@ void TestColSplitQuantile(size_t rows, size_t cols) {
283283
}
284284
} // anonymous namespace
285285

286-
TEST(Quantile, ColSplitBasic) {
286+
TEST(Quantile, ColumnSplitBasic) {
287287
constexpr size_t kRows = 10, kCols = 10;
288288
TestColSplitQuantile<false>(kRows, kCols);
289289
}
290290

291-
TEST(Quantile, ColSplit) {
291+
TEST(Quantile, ColumnSplit) {
292292
constexpr size_t kRows = 4000, kCols = 200;
293293
TestColSplitQuantile<false>(kRows, kCols);
294294
}
295295

296-
TEST(Quantile, ColSplitSortedBasic) {
296+
TEST(Quantile, ColumnSplitSortedBasic) {
297297
constexpr size_t kRows = 10, kCols = 10;
298298
TestColSplitQuantile<true>(kRows, kCols);
299299
}
300300

301-
TEST(Quantile, ColSplitSorted) {
301+
TEST(Quantile, ColumnSplitSorted) {
302302
constexpr size_t kRows = 4000, kCols = 200;
303303
TestColSplitQuantile<true>(kRows, kCols);
304304
}

tests/cpp/tree/test_approx.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void TestColumnSplitPartitioner(size_t n_samples, size_t base_rowid, std::shared
181181
}
182182
} // anonymous namespace
183183

184-
TEST(Approx, PartitionerColSplit) {
184+
TEST(Approx, PartitionerColumnSplit) {
185185
size_t n_samples = 1024, n_features = 16, base_rowid = 0;
186186
auto const Xy = RandomDataGenerator{n_samples, n_features, 0}.GenerateDMatrix(true);
187187
auto hess = GenerateHess(n_samples);
@@ -211,7 +211,7 @@ TEST(Approx, PartitionerColSplit) {
211211
}
212212

213213
namespace {
214-
class TestApproxColSplit : public ::testing::TestWithParam<std::tuple<bool, float>> {
214+
class TestApproxColumnSplit : public ::testing::TestWithParam<std::tuple<bool, float>> {
215215
public:
216216
void Run() {
217217
auto [categorical, sparsity] = GetParam();
@@ -220,9 +220,9 @@ class TestApproxColSplit : public ::testing::TestWithParam<std::tuple<bool, floa
220220
};
221221
} // namespace
222222

223-
TEST_P(TestApproxColSplit, Basic) { this->Run(); }
223+
TEST_P(TestApproxColumnSplit, Basic) { this->Run(); }
224224

225-
INSTANTIATE_TEST_SUITE_P(ColumnSplit, TestApproxColSplit, ::testing::ValuesIn([]() {
225+
INSTANTIATE_TEST_SUITE_P(ColumnSplit, TestApproxColumnSplit, ::testing::ValuesIn([]() {
226226
std::vector<std::tuple<bool, float>> params;
227227
for (auto categorical : {true, false}) {
228228
for (auto sparsity : {0.0f, 0.6f}) {

tests/cpp/tree/test_quantile_hist.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ void TestColumnSplitPartitioner(bst_target_t n_targets) {
203203
}
204204
} // anonymous namespace
205205

206-
TEST(QuantileHist, PartitionerColSplit) { TestColumnSplitPartitioner<CPUExpandEntry>(1); }
206+
TEST(QuantileHist, PartitionerColumnSplit) { TestColumnSplitPartitioner<CPUExpandEntry>(1); }
207207

208-
TEST(QuantileHist, MultiPartitionerColSplit) { TestColumnSplitPartitioner<MultiExpandEntry>(3); }
208+
TEST(QuantileHist, MultiPartitionerColumnSplit) { TestColumnSplitPartitioner<MultiExpandEntry>(3); }
209209

210210
namespace {
211-
class TestHistColSplit : public ::testing::TestWithParam<std::tuple<bst_target_t, bool, float>> {
211+
class TestHistColumnSplit : public ::testing::TestWithParam<std::tuple<bst_target_t, bool, float>> {
212212
public:
213213
void Run() {
214214
auto [n_targets, categorical, sparsity] = GetParam();
@@ -217,9 +217,9 @@ class TestHistColSplit : public ::testing::TestWithParam<std::tuple<bst_target_t
217217
};
218218
} // anonymous namespace
219219

220-
TEST_P(TestHistColSplit, Basic) { this->Run(); }
220+
TEST_P(TestHistColumnSplit, Basic) { this->Run(); }
221221

222-
INSTANTIATE_TEST_SUITE_P(ColumnSplit, TestHistColSplit, ::testing::ValuesIn([]() {
222+
INSTANTIATE_TEST_SUITE_P(ColumnSplit, TestHistColumnSplit, ::testing::ValuesIn([]() {
223223
std::vector<std::tuple<bst_target_t, bool, float>> params;
224224
for (auto categorical : {true, false}) {
225225
for (auto sparsity : {0.0f, 0.6f}) {

0 commit comments

Comments
 (0)