You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2013/04/24 22:37:34 UTC
svn commit: r1471656 - /incubator/mesos/trunk/src/tests/log_tests.cpp
Author: benh
Date: Wed Apr 24 20:37:33 2013
New Revision: 1471656
URL: http://svn.apache.org/r1471656
Log:
Increased timeouts used in log tests to avoid test failures due to
slow hardware or resource contention from other processes.
Review: https://reviews.apache.org/r/10464
Modified:
incubator/mesos/trunk/src/tests/log_tests.cpp
Modified: incubator/mesos/trunk/src/tests/log_tests.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/log_tests.cpp?rev=1471656&r1=1471655&r2=1471656&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/log_tests.cpp (original)
+++ incubator/mesos/trunk/src/tests/log_tests.cpp Wed Apr 24 20:37:33 2013
@@ -279,7 +279,7 @@ TEST(CoordinatorTest, Elect)
Coordinator coord(2, &replica1, &network);
{
- Result<uint64_t> result = coord.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
@@ -317,7 +317,7 @@ TEST(CoordinatorTest, AppendRead)
Coordinator coord(2, &replica1, &network);
{
- Result<uint64_t> result = coord.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
@@ -326,7 +326,7 @@ TEST(CoordinatorTest, AppendRead)
{
Result<uint64_t> result2 =
- coord.append("hello world", Timeout(Seconds(2)));
+ coord.append("hello world", Timeout(Seconds(5)));
ASSERT_SOME(result2);
position = result2.get();
EXPECT_EQ(1u, position);
@@ -366,7 +366,7 @@ TEST(CoordinatorTest, AppendReadError)
Coordinator coord(2, &replica1, &network);
{
- Result<uint64_t> result = coord.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
@@ -375,7 +375,7 @@ TEST(CoordinatorTest, AppendReadError)
{
Result<uint64_t> result2 =
- coord.append("hello world", Timeout(Seconds(2)));
+ coord.append("hello world", Timeout(Seconds(5)));
ASSERT_SOME(result2);
position = result2.get();
EXPECT_EQ(1u, position);
@@ -410,9 +410,9 @@ TEST(CoordinatorTest, ElectNoQuorum)
Clock::pause();
// Create a timeout here so that we can advance time.
- Timeout timeout(Seconds(2));
+ Timeout timeout(Seconds(5));
- Clock::advance(Seconds(2));
+ Clock::advance(5.0);
{
Result<uint64_t> result = coord.elect(timeout);
@@ -444,7 +444,7 @@ TEST(CoordinatorTest, AppendNoQuorum)
Coordinator coord(2, &replica1, &network);
{
- Result<uint64_t> result = coord.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
@@ -454,9 +454,9 @@ TEST(CoordinatorTest, AppendNoQuorum)
Clock::pause();
// Create a timeout here so that we can advance time.
- Timeout timeout(Seconds(2));
+ Timeout timeout(Seconds(5));
- Clock::advance(Seconds(2));
+ Clock::advance(5.0);
{
Result<uint64_t> result = coord.append("hello world", timeout);
@@ -489,7 +489,7 @@ TEST(CoordinatorTest, Failover)
Coordinator coord1(2, &replica1, &network1);
{
- Result<uint64_t> result = coord1.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord1.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
@@ -498,7 +498,7 @@ TEST(CoordinatorTest, Failover)
{
Result<uint64_t> result =
- coord1.append("hello world", Timeout(Seconds(2)));
+ coord1.append("hello world", Timeout(Seconds(5)));
ASSERT_SOME(result);
position = result.get();
EXPECT_EQ(1u, position);
@@ -512,7 +512,7 @@ TEST(CoordinatorTest, Failover)
Coordinator coord2(2, &replica2, &network2);
{
- Result<uint64_t> result = coord2.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord2.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(position, result.get());
}
@@ -551,7 +551,7 @@ TEST(CoordinatorTest, Demoted)
Coordinator coord1(2, &replica1, &network1);
{
- Result<uint64_t> result = coord1.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord1.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
@@ -560,7 +560,7 @@ TEST(CoordinatorTest, Demoted)
{
Result<uint64_t> result =
- coord1.append("hello world", Timeout(Seconds(2)));
+ coord1.append("hello world", Timeout(Seconds(5)));
ASSERT_SOME(result);
position = result.get();
EXPECT_EQ(1u, position);
@@ -574,21 +574,21 @@ TEST(CoordinatorTest, Demoted)
Coordinator coord2(2, &replica2, &network2);
{
- Result<uint64_t> result = coord2.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord2.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(position, result.get());
}
{
Result<uint64_t> result =
- coord1.append("hello moto", Timeout(Seconds(2)));
+ coord1.append("hello moto", Timeout(Seconds(5)));
ASSERT_TRUE(result.isError());
EXPECT_EQ("Coordinator demoted", result.error());
}
{
Result<uint64_t> result =
- coord2.append("hello hello", Timeout(Seconds(2)));
+ coord2.append("hello hello", Timeout(Seconds(5)));
ASSERT_SOME(result);
position = result.get();
EXPECT_EQ(2u, position);
@@ -630,7 +630,7 @@ TEST(CoordinatorTest, Fill)
Coordinator coord1(2, &replica1, &network1);
{
- Result<uint64_t> result = coord1.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord1.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
@@ -639,7 +639,7 @@ TEST(CoordinatorTest, Fill)
{
Result<uint64_t> result =
- coord1.append("hello world", Timeout(Seconds(2)));
+ coord1.append("hello world", Timeout(Seconds(5)));
ASSERT_SOME(result);
position = result.get();
EXPECT_EQ(1u, position);
@@ -655,9 +655,9 @@ TEST(CoordinatorTest, Fill)
Coordinator coord2(2, &replica3, &network2);
{
- Result<uint64_t> result = coord2.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord2.elect(Timeout(Seconds(5)));
ASSERT_TRUE(result.isNone());
- result = coord2.elect(Timeout(Seconds(2)));
+ result = coord2.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(position, result.get());
}
@@ -701,7 +701,7 @@ TEST(CoordinatorTest, NotLearnedFill)
Coordinator coord1(2, &replica1, &network1);
{
- Result<uint64_t> result = coord1.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord1.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
@@ -710,7 +710,7 @@ TEST(CoordinatorTest, NotLearnedFill)
{
Result<uint64_t> result =
- coord1.append("hello world", Timeout(Seconds(2)));
+ coord1.append("hello world", Timeout(Seconds(5)));
ASSERT_SOME(result);
position = result.get();
EXPECT_EQ(1u, position);
@@ -726,9 +726,9 @@ TEST(CoordinatorTest, NotLearnedFill)
Coordinator coord2(2, &replica3, &network2);
{
- Result<uint64_t> result = coord2.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord2.elect(Timeout(Seconds(5)));
ASSERT_TRUE(result.isNone());
- result = coord2.elect(Timeout(Seconds(2)));
+ result = coord2.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(position, result.get());
}
@@ -768,14 +768,14 @@ TEST(CoordinatorTest, MultipleAppends)
Coordinator coord(2, &replica1, &network);
{
- Result<uint64_t> result = coord.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
for (uint64_t position = 1; position <= 10; position++) {
Result<uint64_t> result =
- coord.append(stringify(position), Timeout(Seconds(2)));
+ coord.append(stringify(position), Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(position, result.get());
}
@@ -819,14 +819,14 @@ TEST(CoordinatorTest, MultipleAppendsNot
Coordinator coord1(2, &replica1, &network1);
{
- Result<uint64_t> result = coord1.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord1.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
for (uint64_t position = 1; position <= 10; position++) {
Result<uint64_t> result =
- coord1.append(stringify(position), Timeout(Seconds(2)));
+ coord1.append(stringify(position), Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(position, result.get());
}
@@ -841,9 +841,9 @@ TEST(CoordinatorTest, MultipleAppendsNot
Coordinator coord2(2, &replica3, &network2);
{
- Result<uint64_t> result = coord2.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord2.elect(Timeout(Seconds(5)));
ASSERT_TRUE(result.isNone());
- result = coord2.elect(Timeout(Seconds(2)));
+ result = coord2.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(10u, result.get());
}
@@ -884,20 +884,20 @@ TEST(CoordinatorTest, Truncate)
Coordinator coord(2, &replica1, &network);
{
- Result<uint64_t> result = coord.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
for (uint64_t position = 1; position <= 10; position++) {
Result<uint64_t> result =
- coord.append(stringify(position), Timeout(Seconds(2)));
+ coord.append(stringify(position), Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(position, result.get());
}
{
- Result<uint64_t> result = coord.truncate(7, Timeout(Seconds(2)));
+ Result<uint64_t> result = coord.truncate(7, Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(11u, result.get());
}
@@ -947,20 +947,20 @@ TEST(CoordinatorTest, TruncateNotLearned
Coordinator coord1(2, &replica1, &network1);
{
- Result<uint64_t> result = coord1.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord1.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
for (uint64_t position = 1; position <= 10; position++) {
Result<uint64_t> result =
- coord1.append(stringify(position), Timeout(Seconds(2)));
+ coord1.append(stringify(position), Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(position, result.get());
}
{
- Result<uint64_t> result = coord1.truncate(7, Timeout(Seconds(2)));
+ Result<uint64_t> result = coord1.truncate(7, Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(11u, result.get());
}
@@ -975,9 +975,9 @@ TEST(CoordinatorTest, TruncateNotLearned
Coordinator coord2(2, &replica3, &network2);
{
- Result<uint64_t> result = coord2.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord2.elect(Timeout(Seconds(5)));
ASSERT_TRUE(result.isNone());
- result = coord2.elect(Timeout(Seconds(2)));
+ result = coord2.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(11u, result.get());
}
@@ -1026,20 +1026,20 @@ TEST(CoordinatorTest, TruncateLearnedFil
Coordinator coord1(2, &replica1, &network1);
{
- Result<uint64_t> result = coord1.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord1.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(0u, result.get());
}
for (uint64_t position = 1; position <= 10; position++) {
Result<uint64_t> result =
- coord1.append(stringify(position), Timeout(Seconds(2)));
+ coord1.append(stringify(position), Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(position, result.get());
}
{
- Result<uint64_t> result = coord1.truncate(7, Timeout(Seconds(2)));
+ Result<uint64_t> result = coord1.truncate(7, Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(11u, result.get());
}
@@ -1054,9 +1054,9 @@ TEST(CoordinatorTest, TruncateLearnedFil
Coordinator coord2(2, &replica3, &network2);
{
- Result<uint64_t> result = coord2.elect(Timeout(Seconds(2)));
+ Result<uint64_t> result = coord2.elect(Timeout(Seconds(5)));
ASSERT_TRUE(result.isNone());
- result = coord2.elect(Timeout(Seconds(2)));
+ result = coord2.elect(Timeout(Seconds(5)));
ASSERT_SOME(result);
EXPECT_EQ(11u, result.get());
}
@@ -1099,17 +1099,17 @@ TEST(LogTest, WriteRead)
Log log(2, path2, pids);
- Log::Writer writer(&log, Seconds(2));
+ Log::Writer writer(&log, Seconds(5));
Result<Log::Position> position =
- writer.append("hello world", Timeout(Seconds(2)));
+ writer.append("hello world", Timeout(Seconds(5)));
ASSERT_SOME(position);
Log::Reader reader(&log);
Result<std::list<Log::Entry> > entries =
- reader.read(position.get(), position.get(), Timeout(Seconds(2)));
+ reader.read(position.get(), position.get(), Timeout(Seconds(5)));
ASSERT_SOME(entries);
ASSERT_EQ(1u, entries.get().size());
@@ -1136,10 +1136,10 @@ TEST(LogTest, Position)
Log log(2, path2, pids);
- Log::Writer writer(&log, Seconds(2));
+ Log::Writer writer(&log, Seconds(5));
Result<Log::Position> position =
- writer.append("hello world", Timeout(Seconds(2)));
+ writer.append("hello world", Timeout(Seconds(5)));
ASSERT_SOME(position);