HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D641

Wait for Marathon to restart in RestartIntegrationTest.
ClosedAll Users
Actions

Authored by jeschkies on Mar 23 2017, 12:19 PM.

Details

Reviewers
aquamatthias
zen-dog
timcharper
jenkins
Commits
rMARATHON9175314a7c3d: Wait for Marathon to restart in RestartIntegrationTest.
rMARATHONb843b8beffcb: Wait for Marathon to restart in RestartIntegrationTest.
JIRA Issues
JIRA MARATHON-7063 RestartIntegrationTest is flaky
Summary

This explains some falkiness. We do not wait until Marathon is up again.
The test failed 1 in 2 times on my machine. With this fix it does not.

Test Plan

integration-test, loop

Diff Detail

Repository
rMARATHON marathon
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
Changes from before your most recent comment are hidden. Show Older Changes
jeschkies added a comment.Mar 23 2017, 12:31 PM
In D641#22068, @zen-dog wrote:

And if you're already at the test - I'd limit the number of runs to a smaller number e.g. 5. Otherwise the test just takes too long.

abdicationLoops = 2 :).

jenkins accepted this revision.Mar 23 2017, 2:02 PM

LGTM

aquamatthias accepted this revision.Mar 23 2017, 3:41 PM
aquamatthias added a subscriber: aquamatthias.

Thanks!

aquamatthias added 1 JIRA issue(s): MARATHON-7063.Mar 23 2017, 3:42 PM
aquamatthias removed a reviewer: • jasongilanfarr.
zen-dog accepted this revision.Mar 23 2017, 4:36 PM
This revision is now accepted and ready to land.Mar 23 2017, 4:36 PM
Closed by commit rMARATHONb843b8beffcb: Wait for Marathon to restart in RestartIntegrationTest. (authored by jeschkies). · Explain WhyMar 23 2017, 4:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2373

View Options

src/test/scala/mesosphere/marathon/integration/RestartIntegrationTest.scala

Show All 38 Lines
3939 .copy(constraints = constraint)
4040 f.marathon.createAppV2(app)
4141
4242 When("one of the tasks is deployed")
4343 val tasksBeforeAbdication = f.waitForTasks(app.id.toPath, 1)
4444
4545 (1 to abdicationLoops).foreach { _ =>
4646 And("the leader abdicates")
47 server.restart()
47 server.restart().futureValue
4848 val tasksAfterFirstAbdication = f.waitForTasks(app.id.toPath, 1)
4949 Then("the already running task should not be killed")
5050 tasksBeforeAbdication should be(tasksAfterFirstAbdication)
5151 }
5252 }
5353
5454 "readiness" should {
5555 "deployment with 1 ready and 1 not ready instance is continued properly after a restart" in withMarathon("readiness") { (server, f) =>
▲ Show 20 Lines • Show All 117 Lines • Show Last 20 Lines