Skip to content

Commit 18c79d1

Browse files
Swap to basing timeouts on time unit so CI tests get longer timeouts
1 parent 3d74c7a commit 18c79d1

7 files changed

Lines changed: 9 additions & 7 deletions

File tree

tests/test_util/TestBase.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <utility>
2929

3030
#include "nuclear"
31+
#include "test_util/TimeUnit.hpp" // IWYU pragma: export
3132
#include "test_util/diff_string.hpp" // IWYU pragma: export
3233

3334
namespace test_util {
@@ -57,7 +58,7 @@ class TestBase : public NUClear::Reactor {
5758
private:
5859
explicit TestBase(std::unique_ptr<NUClear::Environment> environment,
5960
const bool& shutdown_on_idle = true,
60-
const std::chrono::milliseconds& timeout = std::chrono::milliseconds(1000))
61+
const std::chrono::milliseconds& timeout = TimeUnit(20))
6162
: Reactor(std::move(environment)) {
6263

6364
// Shutdown if the system is idle

tests/tests/dsl/Every.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
class TestReactor : public test_util::TestBase<TestReactor> {
4040
public:
4141
TestReactor(std::unique_ptr<NUClear::Environment> environment)
42-
: TestBase(std::move(environment), false, std::chrono::seconds(10)) {
42+
: TestBase(std::move(environment), false, test_util::TimeUnit(200)) {
4343

4444
// Trigger on 3 different types of every
4545
on<Every<1000, Per<std::chrono::seconds>>>().then([this]() { every_times.push_back(NUClear::clock::now()); });

tests/tests/dsl/Idle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class TestReactor : public test_util::TestBase<TestReactor> {
5757
}
5858

5959
explicit TestReactor(std::unique_ptr<NUClear::Environment> environment)
60-
: TestBase(std::move(environment), false, std::chrono::seconds(5)) {
60+
: TestBase(std::move(environment), false, test_util::TimeUnit(100)) {
6161

6262
start_time = NUClear::clock::now();
6363

tests/tests/dsl/IdleSingleGlobal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class TestReactor : public test_util::TestBase<TestReactor> {
5959
static constexpr int n_loops = 10000;
6060

6161
explicit TestReactor(std::unique_ptr<NUClear::Environment> environment)
62-
: TestBase(std::move(environment), false, std::chrono::seconds(2)) {
62+
: TestBase(std::move(environment), false, test_util::TimeUnit(50)) {
6363

6464
/*
6565
* Run idle on the default pool, and a task on the main pool.

tests/tests/dsl/SyncOrder.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ class TestReactor : public test_util::TestBase<TestReactor> {
3939
Message(int val) : val(val) {};
4040
};
4141

42-
TestReactor(std::unique_ptr<NUClear::Environment> environment) : TestBase(std::move(environment)) {
42+
TestReactor(std::unique_ptr<NUClear::Environment> environment)
43+
: TestBase(std::move(environment), true, test_util::TimeUnit(50)) {
4344

4445
on<Trigger<Message<'A'>>, Sync<TestReactor>>().then([this](const Message<'A'>& m) { //
4546
events.emplace_back('A', m.val);

tests/tests/dsl/TCP.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class TestReactor : public test_util::TestBase<TestReactor> {
8484
}
8585

8686
TestReactor(std::unique_ptr<NUClear::Environment> environment, const std::vector<TestType>& active_tests_)
87-
: TestBase(std::move(environment), false, std::chrono::seconds(2)), active_tests(active_tests_) {
87+
: TestBase(std::move(environment), false, test_util::TimeUnit(50)), active_tests(active_tests_) {
8888

8989
for (const auto& t : active_tests) {
9090
switch (t) {

tests/tests/dsl/emit/Delay.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class TestReactor : public test_util::TestBase<TestReactor> {
5454

5555
struct FinishTest {};
5656
TestReactor(std::unique_ptr<NUClear::Environment> environment)
57-
: TestBase(std::move(environment), false, std::chrono::seconds(2)) {
57+
: TestBase(std::move(environment), false, test_util::TimeUnit(50)) {
5858

5959
// Measure when messages were sent and received and print those values
6060
on<Trigger<DelayedMessage>>().then([this](const DelayedMessage& m) {

0 commit comments

Comments
 (0)