You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/02/25 01:14:38 UTC
[2/2] mesos git commit: Cleaned up MesosSchedulerDriver shutdown in
unit tests.
Cleaned up MesosSchedulerDriver shutdown in unit tests.
For consistency, we should do `driver.stop(); driver.join();` if a
`MesosSchedulerDriver` has been started by the unit test. The destructor
for `MesosSchedulerDriver` will do something _similar_, so the
consequence of omitting these calls is not dire, but it seems safer to
be consistent between all the test cases.
Review: https://reviews.apache.org/r/42877/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0a15a301
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0a15a301
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0a15a301
Branch: refs/heads/master
Commit: 0a15a3010c6963e09f887afb89930901e9aa3683
Parents: 928ac80
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Feb 24 13:49:31 2016 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Wed Feb 24 16:14:19 2016 -0800
----------------------------------------------------------------------
src/tests/executor_http_api_tests.cpp | 10 ++++++++++
src/tests/oversubscription_tests.cpp | 3 +++
src/tests/scheduler_event_call_tests.cpp | 27 +++++++++++++++++++++++++++
src/tests/scheduler_http_api_tests.cpp | 3 +++
src/tests/slave_tests.cpp | 13 ++++++++++++-
5 files changed, 55 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0a15a301/src/tests/executor_http_api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/executor_http_api_tests.cpp b/src/tests/executor_http_api_tests.cpp
index 36a042e..2fc0893 100644
--- a/src/tests/executor_http_api_tests.cpp
+++ b/src/tests/executor_http_api_tests.cpp
@@ -393,6 +393,9 @@ TEST_P(ExecutorHttpApiTest, DefaultAccept)
AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
+ driver.stop();
+ driver.join();
+
Shutdown();
}
@@ -473,6 +476,9 @@ TEST_P(ExecutorHttpApiTest, NoAcceptHeader)
AWAIT_EXPECT_RESPONSE_STATUS_EQ(OK().status, response);
AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
+ driver.stop();
+ driver.join();
+
Shutdown();
}
@@ -797,6 +803,10 @@ TEST_P(ExecutorHttpApiTest, Subscribe)
call.executor_id());
reader.get().close();
+
+ driver.stop();
+ driver.join();
+
Shutdown();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/0a15a301/src/tests/oversubscription_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/oversubscription_tests.cpp b/src/tests/oversubscription_tests.cpp
index d4ae819..e528476 100644
--- a/src/tests/oversubscription_tests.cpp
+++ b/src/tests/oversubscription_tests.cpp
@@ -1118,6 +1118,9 @@ TEST_F(OversubscriptionTest, RemoveCapabilitiesOnSchedulerFailover)
driver1.stop();
driver1.join();
+ driver2.stop();
+ driver2.join();
+
Shutdown();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/0a15a301/src/tests/scheduler_event_call_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_event_call_tests.cpp b/src/tests/scheduler_event_call_tests.cpp
index bd8920f..8c02cee 100644
--- a/src/tests/scheduler_event_call_tests.cpp
+++ b/src/tests/scheduler_event_call_tests.cpp
@@ -110,6 +110,9 @@ TEST_F(SchedulerDriverEventTest, Subscribed)
process::post(master.get(), frameworkPid, event);
AWAIT_READY(registered);
+
+ driver.stop();
+ driver.join();
}
@@ -176,6 +179,9 @@ TEST_F(SchedulerDriverEventTest, SubscribedDisconnection)
process::post(master.get(), frameworkPid, event);
AWAIT_READY(reregistered);
+
+ driver.stop();
+ driver.join();
}
@@ -248,6 +254,9 @@ TEST_F(SchedulerDriverEventTest, SubscribedMasterFailover)
process::post(master.get(), frameworkPid, event);
AWAIT_READY(reregistered);
+
+ driver.stop();
+ driver.join();
}
@@ -319,6 +328,9 @@ TEST_F(SchedulerDriverEventTest, SubscribedSchedulerFailover)
process::post(master.get(), frameworkPid2, event);
AWAIT_READY(registered2);
+
+ driver.stop();
+ driver.join();
}
@@ -449,6 +461,9 @@ TEST_F(SchedulerDriverEventTest, Rescind)
process::post(master.get(), frameworkPid, event);
AWAIT_READY(offerRescinded);
+
+ driver.stop();
+ driver.join();
}
@@ -521,6 +536,9 @@ TEST_F(SchedulerDriverEventTest, Update)
AWAIT_READY(statusUpdate2);
AWAIT_READY(acknowledgement);
+
+ driver.stop();
+ driver.join();
}
@@ -561,6 +579,9 @@ TEST_F(SchedulerDriverEventTest, Message)
process::post(master.get(), frameworkPid, event);
AWAIT_READY(frameworkMessage);
+
+ driver.stop();
+ driver.join();
}
@@ -616,6 +637,9 @@ TEST_F(SchedulerDriverEventTest, Failure)
process::post(master.get(), frameworkPid, event);
AWAIT_READY(slaveLost);
+
+ driver.stop();
+ driver.join();
}
@@ -650,6 +674,9 @@ TEST_F(SchedulerDriverEventTest, Error)
process::post(master.get(), frameworkPid, event);
AWAIT_READY(error);
+
+ driver.stop();
+ driver.join();
}
} // namespace tests {
http://git-wip-us.apache.org/repos/asf/mesos/blob/0a15a301/src/tests/scheduler_http_api_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_http_api_tests.cpp b/src/tests/scheduler_http_api_tests.cpp
index 9eb1de7..428e126 100644
--- a/src/tests/scheduler_http_api_tests.cpp
+++ b/src/tests/scheduler_http_api_tests.cpp
@@ -585,6 +585,9 @@ TEST_P(SchedulerHttpApiTest, UpdateHttpToPidScheduler)
AWAIT_READY(frameworkId);
ASSERT_EQ(evolve(frameworkId.get()), frameworkInfo.id());
+ driver.stop();
+ driver.join();
+
Shutdown();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/0a15a301/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index c7285f7..322f3dd 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -1506,7 +1506,6 @@ TEST_F(SlaveTest, DISABLED_TerminatingSlaveDoesNotReregister)
AWAIT_READY(executorLost);
- // Clean up.
driver.stop();
driver.join();
@@ -2879,6 +2878,12 @@ TEST_F(SlaveTest, HTTPScheduler)
AWAIT_READY(frameworkMessage);
+ EXPECT_CALL(exec, shutdown(_))
+ .Times(AtMost(1));
+
+ driver.stop();
+ driver.join();
+
// Must call shutdown before the mock executor gets deallocated.
Shutdown();
}
@@ -2949,6 +2954,12 @@ TEST_F(SlaveTest, HTTPSchedulerLiveUpgrade)
AWAIT_READY(frameworkMessage);
+ EXPECT_CALL(exec, shutdown(_))
+ .Times(AtMost(1));
+
+ driver.stop();
+ driver.join();
+
// Must call shutdown before the mock executor gets deallocated.
Shutdown();
}