Return-Path: 
 <commits-return-26875-apmail-ambari-commits-archive=ambari.apache.org@ambari.apache.org>
X-Original-To: apmail-ambari-commits-archive@www.apache.org
Delivered-To: apmail-ambari-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 26AAA19E54
	for <apmail-ambari-commits-archive@www.apache.org>;
 Thu, 14 Apr 2016 21:06:31 +0000 (UTC)
Received: (qmail 64639 invoked by uid 500); 14 Apr 2016 21:06:31 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 64608 invoked by uid 500); 14 Apr 2016 21:06:31 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 64599 invoked by uid 99); 14 Apr 2016 21:06:31 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2016 21:06:31 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id E83BEDFC13; Thu, 14 Apr 2016 21:06:30 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jonathanhurley@apache.org
To: commits@ambari.apache.org
Message-Id: <578e18b5a7814083ac854071f9361039@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-15895 - AlertReceivedListenerTest is Flaky
 When Running @Before Code (jonathanhurley)
Date: Thu, 14 Apr 2016 21:06:30 +0000 (UTC)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 1a782858d -> d050e74b9


AMBARI-15895 - AlertReceivedListenerTest is Flaky When Running @Before Code (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d050e74b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d050e74b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d050e74b

Branch: refs/heads/branch-2.2
Commit: d050e74b9b53e11969e1cfc21a929f88ca4571b9
Parents: 1a78285
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Thu Apr 14 15:26:18 2016 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Thu Apr 14 17:06:13 2016 -0400

----------------------------------------------------------------------
 ambari-project/pom.xml                                            | 3 ++-
 .../ambari/server/state/alerts/AlertReceivedListenerTest.java     | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d050e74b/ambari-project/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 076e88f..2a4c124 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -507,8 +507,9 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
-          <forkMode>always</forkMode>
           <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
+          <reuseForks>false</reuseForks>
+          <forkCount>1</forkCount>
         </configuration>
       </plugin>
       <plugin>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d050e74b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertReceivedListenerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertReceivedListenerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertReceivedListenerTest.java
index 0d893af..2c30259 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertReceivedListenerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertReceivedListenerTest.java
@@ -50,6 +50,7 @@ import org.junit.Test;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.persist.PersistService;
+import com.google.inject.persist.UnitOfWork;
 
 /**
  * Tests the {@link AlertReceivedListener}.
@@ -75,6 +76,7 @@ public class AlertReceivedListenerTest {
   public void setup() throws Exception {
     m_injector = Guice.createInjector(new InMemoryDefaultTestModule());
     m_injector.getInstance(GuiceJpaInitializer.class);
+    m_injector.getInstance(UnitOfWork.class).begin();
 
     m_helper = m_injector.getInstance(OrmTestHelper.class);
     m_clusters = m_injector.getInstance(Clusters.class);
@@ -115,6 +117,7 @@ public class AlertReceivedListenerTest {
 
   @After
   public void teardown() {
+    m_injector.getInstance(UnitOfWork.class).end();
     m_injector.getInstance(PersistService.class).stop();
     m_injector = null;
   }