Repository: mesos Updated Branches: refs/heads/master 8cb59f388 -> 8717b78fc
Removed gcc 4.1.* workaround in the tests. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8717b78f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8717b78f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8717b78f Branch: refs/heads/master Commit: 8717b78fc5549352637f4d21433669cbdbeca2d1 Parents: 8cb59f3 Author: Benjamin Mahler <[email protected]> Authored: Thu Jul 30 17:04:43 2015 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Thu Jul 30 17:14:31 2015 -0700 ---------------------------------------------------------------------- src/tests/authentication_tests.cpp | 12 ++++------- src/tests/fault_tolerance_tests.cpp | 21 +++++++------------ src/tests/gc_tests.cpp | 7 ++----- src/tests/master_allocator_tests.cpp | 28 +++++++++----------------- src/tests/master_authorization_tests.cpp | 12 ++++------- src/tests/master_tests.cpp | 7 ++----- src/tests/rate_limiting_tests.cpp | 12 ++++------- src/tests/status_update_manager_tests.cpp | 21 +++++++------------ 8 files changed, 39 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8717b78f/src/tests/authentication_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/authentication_tests.cpp b/src/tests/authentication_tests.cpp index 5126ed4..d5f5574 100644 --- a/src/tests/authentication_tests.cpp +++ b/src/tests/authentication_tests.cpp @@ -168,8 +168,7 @@ TEST_F(AuthenticationTest, MismatchedFrameworkInfoPrincipal) ASSERT_SOME(master); MockScheduler sched; - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_principal("mismatched-principal"); MesosSchedulerDriver driver( @@ -203,8 +202,7 @@ TEST_F(AuthenticationTest, UnspecifiedFrameworkInfoPrincipal) ASSERT_SOME(master); MockScheduler sched; - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.clear_principal(); MesosSchedulerDriver driver( @@ -735,8 +733,7 @@ TEST_F(AuthenticationTest, SchedulerFailover) MockScheduler sched2; - FrameworkInfo framework2; // Bug in gcc 4.1.*, must assign on next line. - framework2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo framework2 = DEFAULT_FRAMEWORK_INFO; framework2.mutable_id()->MergeFrom(frameworkId.get()); MesosSchedulerDriver driver2( @@ -805,8 +802,7 @@ TEST_F(AuthenticationTest, RejectedSchedulerFailover) // will not be asked to shutdown. MockScheduler sched2; - FrameworkInfo framework2; // Bug in gcc 4.1.*, must assign on next line. - framework2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo framework2 = DEFAULT_FRAMEWORK_INFO; framework2.mutable_id()->MergeFrom(frameworkId.get()); framework2.set_principal("mismatched-principal"); http://git-wip-us.apache.org/repos/asf/mesos/blob/8717b78f/src/tests/fault_tolerance_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp index 7b977f5..c63599a 100644 --- a/src/tests/fault_tolerance_tests.cpp +++ b/src/tests/fault_tolerance_tests.cpp @@ -390,8 +390,7 @@ TEST_F(FaultToleranceTest, SchedulerFailover) MockScheduler sched2; - FrameworkInfo framework2; // Bug in gcc 4.1.*, must assign on next line. - framework2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo framework2 = DEFAULT_FRAMEWORK_INFO; framework2.mutable_id()->MergeFrom(frameworkId.get()); MesosSchedulerDriver driver2( @@ -488,8 +487,7 @@ TEST_F(FaultToleranceTest, SchedulerReregisterAfterFailoverTimeout) // framework id recorded from the first scheduler. MockScheduler sched2; - FrameworkInfo framework2; // Bug in gcc 4.1.*, must assign on next line. - framework2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo framework2 = DEFAULT_FRAMEWORK_INFO; framework2.mutable_id()->MergeFrom(frameworkId.get()); MesosSchedulerDriver driver2( @@ -558,8 +556,7 @@ TEST_F(FaultToleranceTest, SchedulerReregisterAfterUnregistration) // framework id recorded from the first scheduler. MockScheduler sched2; - FrameworkInfo framework2; // Bug in gcc 4.1.*, must assign on next line. - framework2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo framework2 = DEFAULT_FRAMEWORK_INFO; framework2.mutable_id()->MergeFrom(frameworkId.get()); MesosSchedulerDriver driver2( @@ -617,8 +614,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverRetriedReregistration) MockScheduler sched2; - FrameworkInfo framework2; // Bug in gcc 4.1.*, must assign on next line. - framework2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo framework2 = DEFAULT_FRAMEWORK_INFO; framework2.mutable_id()->MergeFrom(frameworkId.get()); MesosSchedulerDriver driver2( @@ -907,8 +903,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverStatusUpdate) MockScheduler sched2; - FrameworkInfo framework2; // Bug in gcc 4.1.*, must assign on next line. - framework2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo framework2 = DEFAULT_FRAMEWORK_INFO; framework2.mutable_id()->MergeFrom(frameworkId); MesosSchedulerDriver driver2( @@ -1200,8 +1195,7 @@ TEST_F(FaultToleranceTest, SchedulerFailoverExecutorToFrameworkMessage) MockScheduler sched2; - FrameworkInfo framework2; // Bug in gcc 4.1.*, must assign on next line. - framework2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo framework2 = DEFAULT_FRAMEWORK_INFO; framework2.mutable_id()->MergeFrom(frameworkId); MesosSchedulerDriver driver2( @@ -1407,8 +1401,7 @@ TEST_F(FaultToleranceTest, IgnoreKillTaskFromUnregisteredFramework) // Now start the second failed over scheduler. MockScheduler sched2; - FrameworkInfo framework2; // Bug in gcc 4.1.*, must assign on next line. - framework2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo framework2 = DEFAULT_FRAMEWORK_INFO; framework2.mutable_id()->MergeFrom(frameworkId); MesosSchedulerDriver driver2( http://git-wip-us.apache.org/repos/asf/mesos/blob/8717b78f/src/tests/gc_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/gc_tests.cpp b/src/tests/gc_tests.cpp index 5666cd1..ec27ac7 100644 --- a/src/tests/gc_tests.cpp +++ b/src/tests/gc_tests.cpp @@ -703,11 +703,8 @@ TEST_F(GarbageCollectorIntegrationTest, Unschedule) Future<SlaveRegisteredMessage> slaveRegistered = FUTURE_PROTOBUF(SlaveRegisteredMessage(), _, _); - ExecutorInfo executor1; // Bug in gcc 4.1.*, must assign on next line. - executor1 = CREATE_EXECUTOR_INFO("executor-1", "exit 1"); - - ExecutorInfo executor2; // Bug in gcc 4.1.*, must assign on next line. - executor2 = CREATE_EXECUTOR_INFO("executor-2", "exit 1"); + ExecutorInfo executor1 = CREATE_EXECUTOR_INFO("executor-1", "exit 1"); + ExecutorInfo executor2 = CREATE_EXECUTOR_INFO("executor-2", "exit 1"); MockExecutor exec1(executor1.executor_id()); MockExecutor exec2(executor2.executor_id()); http://git-wip-us.apache.org/repos/asf/mesos/blob/8717b78f/src/tests/master_allocator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_allocator_tests.cpp b/src/tests/master_allocator_tests.cpp index 147f510..8933196 100644 --- a/src/tests/master_allocator_tests.cpp +++ b/src/tests/master_allocator_tests.cpp @@ -197,8 +197,7 @@ TYPED_TEST(MasterAllocatorTest, ResourcesUnused) // expected offer. AWAIT_READY(recoverResources); - FrameworkInfo frameworkInfo2; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo2 = DEFAULT_FRAMEWORK_INFO; frameworkInfo2.set_user("user2"); frameworkInfo2.set_name("framework2"); @@ -260,8 +259,7 @@ TYPED_TEST(MasterAllocatorTest, OutOfOrderDispatch) Try<PID<Slave> > slave1 = this->StartSlave(flags1); ASSERT_SOME(slave1); - FrameworkInfo frameworkInfo1; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo1 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo1 = DEFAULT_FRAMEWORK_INFO; frameworkInfo1.set_user("user1"); frameworkInfo1.set_name("framework1"); @@ -329,8 +327,7 @@ TYPED_TEST(MasterAllocatorTest, OutOfOrderDispatch) // TODO(benh): Seems like we should wait for the above // recoverResources to be executed. - FrameworkInfo frameworkInfo2; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo2 = DEFAULT_FRAMEWORK_INFO; frameworkInfo2.set_user("user2"); frameworkInfo2.set_name("framework2"); @@ -392,8 +389,7 @@ TYPED_TEST(MasterAllocatorTest, SchedulerFailover) Try<PID<Slave> > slave = this->StartSlave(&exec, flags); ASSERT_SOME(slave); - FrameworkInfo frameworkInfo1; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo1 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo1 = DEFAULT_FRAMEWORK_INFO; frameworkInfo1.set_name("framework1"); frameworkInfo1.set_user("user1"); frameworkInfo1.set_failover_timeout(10); @@ -453,8 +449,7 @@ TYPED_TEST(MasterAllocatorTest, SchedulerFailover) AWAIT_READY(deactivateFramework); - FrameworkInfo frameworkInfo2; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo2 = DEFAULT_FRAMEWORK_INFO; frameworkInfo2.mutable_id()->MergeFrom(frameworkId); // Now launch the second (i.e., failover) scheduler using the @@ -508,11 +503,8 @@ TYPED_TEST(MasterAllocatorTest, FrameworkExited) Try<PID<Master>> master = this->StartMaster(&allocator, masterFlags); ASSERT_SOME(master); - ExecutorInfo executor1; // Bug in gcc 4.1.*, must assign on next line. - executor1 = CREATE_EXECUTOR_INFO("executor-1", "exit 1"); - - ExecutorInfo executor2; // Bug in gcc 4.1.*, must assign on next line. - executor2 = CREATE_EXECUTOR_INFO("executor-2", "exit 1"); + ExecutorInfo executor1 = CREATE_EXECUTOR_INFO("executor-1", "exit 1"); + ExecutorInfo executor2 = CREATE_EXECUTOR_INFO("executor-2", "exit 1"); MockExecutor exec1(executor1.executor_id()); MockExecutor exec2(executor2.executor_id()); @@ -1178,8 +1170,7 @@ TYPED_TEST(MasterAllocatorTest, RoleTest) // Launch a framework with a role that doesn't exist to see that it // receives an error message. - FrameworkInfo frameworkInfo1; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo1 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo1 = DEFAULT_FRAMEWORK_INFO; frameworkInfo1.set_name("framework1"); frameworkInfo1.set_user("user1"); frameworkInfo1.set_role("role1"); @@ -1198,8 +1189,7 @@ TYPED_TEST(MasterAllocatorTest, RoleTest) AWAIT_READY(errorMessage); // Launch a framework under an existing role to see that it registers. - FrameworkInfo frameworkInfo2; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo2 = DEFAULT_FRAMEWORK_INFO; frameworkInfo2.set_name("framework2"); frameworkInfo2.set_user("user2"); frameworkInfo2.set_role("role2"); http://git-wip-us.apache.org/repos/asf/mesos/blob/8717b78f/src/tests/master_authorization_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_authorization_tests.cpp b/src/tests/master_authorization_tests.cpp index d9b5d01..e2dc093 100644 --- a/src/tests/master_authorization_tests.cpp +++ b/src/tests/master_authorization_tests.cpp @@ -85,8 +85,7 @@ TEST_F(MasterAuthorizationTest, AuthorizedTask) ASSERT_SOME(master); // Create an authorized executor. - ExecutorInfo executor; // Bug in gcc 4.1.*, must assign on next line. - executor = CREATE_EXECUTOR_INFO("test-executor", "exit 1"); + ExecutorInfo executor = CREATE_EXECUTOR_INFO("test-executor", "exit 1"); executor.mutable_command()->set_user("foo"); MockExecutor exec(executor.executor_id()); @@ -160,8 +159,7 @@ TEST_F(MasterAuthorizationTest, UnauthorizedTask) ASSERT_SOME(master); // Create an unauthorized executor. - ExecutorInfo executor; // Bug in gcc 4.1.*, must assign on next line. - executor = CREATE_EXECUTOR_INFO("test-executor", "exit 1"); + ExecutorInfo executor = CREATE_EXECUTOR_INFO("test-executor", "exit 1"); executor.mutable_command()->set_user("foo"); MockExecutor exec(executor.executor_id()); @@ -672,8 +670,7 @@ TEST_F(MasterAuthorizationTest, AuthorizedRole) Try<PID<Master> > master = StartMaster(flags); ASSERT_SOME(master); - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_role("foo"); MockScheduler sched; @@ -713,8 +710,7 @@ TEST_F(MasterAuthorizationTest, UnauthorizedRole) Try<PID<Master> > master = StartMaster(flags); ASSERT_SOME(master); - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_role("foo"); MockScheduler sched; http://git-wip-us.apache.org/repos/asf/mesos/blob/8717b78f/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index 6b5b045..2aea430 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -833,11 +833,8 @@ TEST_F(MasterTest, MultipleExecutors) Try<PID<Master>> master = StartMaster(); ASSERT_SOME(master); - ExecutorInfo executor1; // Bug in gcc 4.1.*, must assign on next line. - executor1 = CREATE_EXECUTOR_INFO("executor-1", "exit 1"); - - ExecutorInfo executor2; // Bug in gcc 4.1.*, must assign on next line. - executor2 = CREATE_EXECUTOR_INFO("executor-2", "exit 1"); + ExecutorInfo executor1 = CREATE_EXECUTOR_INFO("executor-1", "exit 1"); + ExecutorInfo executor2 = CREATE_EXECUTOR_INFO("executor-2", "exit 1"); MockExecutor exec1(executor1.executor_id()); MockExecutor exec2(executor2.executor_id()); http://git-wip-us.apache.org/repos/asf/mesos/blob/8717b78f/src/tests/rate_limiting_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/rate_limiting_tests.cpp b/src/tests/rate_limiting_tests.cpp index d02cb5f..f3aedde 100644 --- a/src/tests/rate_limiting_tests.cpp +++ b/src/tests/rate_limiting_tests.cpp @@ -371,8 +371,7 @@ TEST_F(RateLimitingTest, DifferentPrincipalFrameworks) // 1. Register two frameworks. // 1.1. Create the first framework. - FrameworkInfo frameworkInfo1; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo1 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo1 = DEFAULT_FRAMEWORK_INFO; frameworkInfo1.set_principal("framework1"); MockScheduler sched1; @@ -399,8 +398,7 @@ TEST_F(RateLimitingTest, DifferentPrincipalFrameworks) const process::UPID sched1Pid = frameworkRegisteredMessage1.get().to; // 1.2. Create the second framework. - FrameworkInfo frameworkInfo2; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo2 = DEFAULT_FRAMEWORK_INFO; frameworkInfo2.set_principal("framework2"); MockScheduler sched2; @@ -844,8 +842,7 @@ TEST_F(RateLimitingTest, SchedulerFailover) MockScheduler sched2; - FrameworkInfo framework2; // Bug in gcc 4.1.*, must assign on next line. - framework2 = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo framework2 = DEFAULT_FRAMEWORK_INFO; framework2.mutable_id()->MergeFrom(frameworkId.get()); MesosSchedulerDriver driver2( @@ -966,8 +963,7 @@ TEST_F(RateLimitingTest, CapacityReached) MockScheduler sched; - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; // Use a long failover timeout so the master doesn't unregister the // framework right away when it aborts. http://git-wip-us.apache.org/repos/asf/mesos/blob/8717b78f/src/tests/status_update_manager_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/status_update_manager_tests.cpp b/src/tests/status_update_manager_tests.cpp index 0224e50..9970d71 100644 --- a/src/tests/status_update_manager_tests.cpp +++ b/src/tests/status_update_manager_tests.cpp @@ -104,8 +104,7 @@ TEST_F(StatusUpdateManagerTest, CheckpointStatusUpdate) Try<PID<Slave> > slave = StartSlave(&exec, flags); ASSERT_SOME(slave); - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_checkpoint(true); // Enable checkpointing. MockScheduler sched; @@ -197,8 +196,7 @@ TEST_F(StatusUpdateManagerTest, RetryStatusUpdate) Try<PID<Slave> > slave = StartSlave(&exec, flags); ASSERT_SOME(slave); - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_checkpoint(true); // Enable checkpointing. MockScheduler sched; @@ -269,8 +267,7 @@ TEST_F(StatusUpdateManagerTest, IgnoreDuplicateStatusUpdateAck) Try<PID<Slave> > slave = StartSlave(&exec); ASSERT_SOME(slave); - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_checkpoint(true); // Enable checkpointing. MockScheduler sched; @@ -382,8 +379,7 @@ TEST_F(StatusUpdateManagerTest, IgnoreUnexpectedStatusUpdateAck) Try<PID<Slave> > slave = StartSlave(&exec); ASSERT_SOME(slave); - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_checkpoint(true); // Enable checkpointing. MockScheduler sched; @@ -474,8 +470,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateTerminalUpdateBeforeAck) Try<PID<Slave> > slave = StartSlave(&exec); ASSERT_SOME(slave); - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_checkpoint(true); // Enable checkpointing. MockScheduler sched; @@ -585,8 +580,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateTerminalUpdateAfterAck) Try<PID<Slave> > slave = StartSlave(&exec, flags); ASSERT_SOME(slave); - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_checkpoint(true); // Enable checkpointing. MockScheduler sched; @@ -681,8 +675,7 @@ TEST_F(StatusUpdateManagerTest, DuplicateUpdateBeforeAck) Try<PID<Slave> > slave = StartSlave(&exec); ASSERT_SOME(slave); - FrameworkInfo frameworkInfo; // Bug in gcc 4.1.*, must assign on next line. - frameworkInfo = DEFAULT_FRAMEWORK_INFO; + FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_checkpoint(true); // Enable checkpointing. MockScheduler sched;
