Mark last unstable tests as stable on master.
ClosedAll Users
Actions

			Path	Packages
M			src/test/scala/mesosphere/marathon/integration/LeaderIntegrationTest.scala (2 lines)
M			src/test/scala/mesosphere/marathon/integration/NetworkPartitionIntegrationTest.scala (2 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	2307	ab50318		Mar 20 2017, 11:11 AM	★	★
Diff 2	2308	ab50318	- Mark NetworkPartitionIngerationTest as serial.	Mar 20 2017, 12:05 PM	★	★
Diff 3	2329	9749453	rMARATHON8c5c1dfb420712bc4e3f89f132ef9a2da03b33a8	Mar 21 2017, 10:30 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
b281d8e29014	5a540b686f92	d23114255fa7	jeschkies	Mark NetworkPartitionIngerationTest as serial.	Mar 20 2017, 12:04 PM
d23114255fa7	df69aec9c7f0	ab5031892c68	jeschkies	Mark last unstable tests as stable on master. (Show More…)	Mar 20 2017, 11:10 AM

Diff 2329

Show First 20 Lines • Show All 92 Lines • ▼ Show 20 Line(s)
93	93	And("the leader must have died")
94	94	WaitTestSupport.waitUntil("the leading marathon dies changes", 30.seconds) {
95	95	!server.isRunning()
96	96	}
97	97	}
98	98	}
99	99	}
100	100
101		@UnstableTest
	101	@IntegrationTest
102	102	class ReelectionLeaderIntegrationTest extends LeaderIntegrationTest {
103	103
104	104	val zkTimeout = 2000L
105	105	override val marathonArgs: Map[String, String] = Map(
106	106	"zk_timeout" -> s"$zkTimeout"
107	107	)
108	108
109	109	override val numAdditionalMarathons = 2
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines

Show All 11 Lines
12	12	* Integration test to simulate the issues discovered a verizon where a network partition caused Marathon to be
13	13	* separated from ZK and the leading Master. During this separation the agents were partitioned from the Master. Marathon was
14	14	* bounced, then the network connectivity was re-established. At which time the Mesos kills tasks on the slaves and marathon never
15	15	* restarts them.
16	16	*
17	17	* This collection of integration tests is intended to go beyond the experience at Verizon. The network partition in these tests
18	18	* are simulated with a disconnection from the processes.
19	19	*/
20		@UnstableTest
	20	@SerialIntegrationTest
21	21	class NetworkPartitionIntegrationTest extends AkkaIntegrationTest with EmbeddedMarathonTest with Eventually {
22	22
23	23	override implicit lazy val patienceConfig = PatienceConfig(timeout = Span(50, Seconds), interval = Span(1, Second))
24	24
25	25	override lazy val mesosNumMasters = 1
26	26	override lazy val mesosNumSlaves = 1
27	27
28	28	override val marathonArgs: Map[String, String] = Map(
▲ Show 20 Lines • Show All 73 Lines • Show Last 20 Lines