HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D274

Test app resources with embedded task failures.
ClosedAll Users
Actions

Authored by jeschkies on Dec 5 2016, 8:25 PM.

Details

Reviewers
aquamatthias
unterstein
Commits
rMARATHON80840ca77105: Test app resources with embedded task failures.
rMARATHON1f5e62f7b3e3: Test app resources with embedded task failures.
rMARATHONa02dbe736113: Test app resources with embedded task failures.
rMARATHON2078a5c80350: Test app resources with embedded task failures.
Summary

Closes #4765. Just verify that index returns last task
failures.

Test Plan

unit-test

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.
jeschkies retitled this revision from to Test app resources with embedded task failures..Dec 5 2016, 8:25 PM
jeschkies updated this object.
jeschkies edited the test plan for this revision. (Show Details)
jeschkies added reviewers: unterstein, aquamatthias.
jeschkies added subscribers: jenkins, marathon-team.
unterstein accepted this revision.Dec 6 2016, 10:46 AM
This revision is now accepted and ready to land.Dec 6 2016, 10:46 AM
aquamatthias accepted this revision.Dec 6 2016, 1:09 PM
Closed by commit rMARATHON80840ca77105: Test app resources with embedded task failures. (authored by jeschkies). · Explain WhyDec 6 2016, 2:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1099

View Options

src/test/scala/mesosphere/marathon/api/v2/AppsResourceTest.scala

Show All 17 Lines
1818import mesosphere.marathon.state.PathId._
1919import mesosphere.marathon.state.VersionInfo.OnlyVersion
2020import mesosphere.marathon.state._
2121import mesosphere.marathon.storage.repository.{ AppRepository, GroupRepository, TaskFailureRepository }
2222import mesosphere.marathon.test.{ GroupCreation, MarathonActorSupport, MarathonSpec, Mockito }
2323import mesosphere.marathon.upgrade.DeploymentPlan
2424import org.apache.mesos.{ Protos => Mesos }
2525import org.scalatest.{ GivenWhenThen, Matchers }
26import play.api.libs.json.{ JsNumber, JsObject, JsResultException, Json }
26import play.api.libs.json.{ JsDefined, JsNumber, JsObject, JsResultException, JsString, Json }
2727
2828import scala.collection.immutable
2929import scala.collection.immutable.Seq
3030import scala.concurrent.Future
3131import scala.concurrent.duration._
3232import scala.language.postfixOps
3333
3434class AppsResourceTest extends MarathonSpec with MarathonActorSupport with Matchers with Mockito with GivenWhenThen with GroupCreation {
▲ Show 20 Lines • Show All 1026 Lines • ▼ Show 20 Line(s)
10611061 appInfoService.selectAppsBy(any, eq(expectedEmbeds)) returns Future.successful(Seq(appInfo))
10621062
10631063 When("The the index is fetched without any filters")
10641064 val response = appsResource.index(null, null, null, new java.util.HashSet(), auth.request)
10651065
10661066 Then("The response holds counts and deployments")
10671067 val appJson = Json.parse(response.getEntity.asInstanceOf[String])
10681068 (appJson \ "apps" \\ "deployments" head) should be (Json.arr(Json.obj("id" -> "deployment-123")))
1069 (appJson \ "apps" \\ "tasksStaged" head) should be (JsNumber(1))
1070 }
1071
1072 test("Index passes with embed LastTaskFailure (regression for #4765)") {
1073 Given("An app and group")
1074 val app = AppDefinition(id = PathId("/app"), cmd = Some("foo"))
1075 val expectedEmbeds: Set[Embed] = Set(Embed.Counts, Embed.Deployments, Embed.LastTaskFailure)
1076 val taskFailure = TaskFailure.empty
1077 val appInfo = AppInfo(app, maybeLastTaskFailure = Some(taskFailure), maybeCounts = Some(TaskCounts(1, 2, 3, 4)))
1078 appInfoService.selectAppsBy(any, eq(expectedEmbeds)) returns Future.successful(Seq(appInfo))
1079
1080 When("The the index is fetched with last task failure")
1081 val embeds = new java.util.HashSet[String]()
1082 embeds.add("apps.lastTaskFailure")
1083 val response = appsResource.index(null, null, null, embeds, auth.request)
1084
1085 Then("The response holds counts and task failure")
1086 val appJson = Json.parse(response.getEntity.asInstanceOf[String])
1087 ((appJson \ "apps" \\ "lastTaskFailure" head) \ "state") should be (JsDefined(JsString("TASK_STAGING")))
10691088 (appJson \ "apps" \\ "tasksStaged" head) should be (JsNumber(1))
10701089 }
10711090
10721091 test("Search apps can be filtered") {
10731092 val app1 = AppDefinition(id = PathId("/app/service-a"), cmd = Some("party hard"), labels = Map("a" -> "1", "b" -> "2"))
10741093 val app2 = AppDefinition(id = PathId("/app/service-b"), cmd = Some("work hard"), labels = Map("a" -> "1", "b" -> "3"))
10751094 val apps = Set(app1, app2)
10761095
▲ Show 20 Lines • Show All 225 Lines • Show Last 20 Lines
View Options

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

11package mesosphere.marathon
22package integration
33
4import mesosphere.{AkkaIntegrationFunTest, IntegrationTag, Unstable}
4import mesosphere.{ AkkaIntegrationFunTest, IntegrationTag, Unstable }
55import mesosphere.marathon.integration.setup._
66import org.apache.zookeeper.data.Stat
7import org.apache.zookeeper.{WatchedEvent, Watcher, ZooKeeper}
7import org.apache.zookeeper.{ WatchedEvent, Watcher, ZooKeeper }
88
99import scala.concurrent.duration._
1010
1111@IntegrationTest
1212class LeaderIntegrationTest extends AkkaIntegrationFunTest with MarathonClusterTest {
1313 test("all nodes return the same leader") {
1414 Given("a leader has been elected")
1515 WaitTestSupport.waitUntil("a leader has been elected", 30.seconds) { marathon.leader().code == 200 }
Show All 18 Lines
3434 val httpConnection = url.openConnection().asInstanceOf[java.net.HttpURLConnection]
3535 httpConnection.setInstanceFollowRedirects(false)
3636 httpConnection.connect()
3737 httpConnection
3838 }
3939
4040 Then("all nodes send a redirect")
4141 results.foreach { connection =>
42 connection.getResponseCode should be(302) withClue(s"Connection to ${connection.getURL} was not a redirect.")
42 connection.getResponseCode should be(302) withClue (s"Connection to ${connection.getURL} was not a redirect.")
4343 }
4444 }
4545
4646 test("the leader abdicates when it receives a DELETE") {
4747 Given("a leader")
4848 WaitTestSupport.waitUntil("a leader has been elected", 30.seconds) { marathon.leader().code == 200 }
4949 val leader = marathon.leader().value
5050
▲ Show 20 Lines • Show All 156 Lines • Show Last 20 Lines