Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-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 0AC8F1794E for ; Tue, 16 Feb 2016 06:38:58 +0000 (UTC) Received: (qmail 20254 invoked by uid 500); 16 Feb 2016 06:38:58 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 20216 invoked by uid 500); 16 Feb 2016 06:38:57 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 20207 invoked by uid 99); 16 Feb 2016 06:38:57 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Feb 2016 06:38:57 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 57BA91A0428 for ; Tue, 16 Feb 2016 06:38:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.671 X-Spam-Level: X-Spam-Status: No, score=0.671 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id I0QsRGFD9tT1 for ; Tue, 16 Feb 2016 06:38:56 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id 22B345F1B9 for ; Tue, 16 Feb 2016 06:38:56 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 5723CE0097 for ; Tue, 16 Feb 2016 06:38:55 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 2E80E3A09F7 for ; Tue, 16 Feb 2016 06:38:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1730634 - /sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java Date: Tue, 16 Feb 2016 06:38:55 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160216063855.2E80E3A09F7@svn01-us-west.apache.org> Author: cziegeler Date: Tue Feb 16 06:38:54 2016 New Revision: 1730634 URL: http://svn.apache.org/viewvc?rev=1730634&view=rev Log: Add delay to tests to give shutdown a little bit of time Modified: sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java Modified: sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java?rev=1730634&r1=1730633&r2=1730634&view=diff ============================================================================== --- sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java (original) +++ sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java Tue Feb 16 06:38:54 2016 @@ -26,10 +26,10 @@ import java.net.ServerSocket; import java.util.HashMap; import java.util.concurrent.locks.ReentrantLock; -import junit.framework.TestCase; - import org.apache.sling.launchpad.base.shared.SharedConstants; +import junit.framework.TestCase; + public class ControlListenerTest extends TestCase { private static String SLING1 = "target/sling.test/1"; @@ -247,6 +247,8 @@ public class ControlListenerTest extends TestCase.assertEquals(0, new ControlListener(main1, null).statusServer()); TestCase.assertEquals(0, new ControlListener(main1, null).shutdownServer()); + delay(); + TestCase.assertTrue(main1.stopCalled); delay(); @@ -259,6 +261,8 @@ public class ControlListenerTest extends TestCase.assertEquals(0, new ControlListener(main2, null).statusServer()); TestCase.assertEquals(0, new ControlListener(main2, null).shutdownServer()); + delay(); + TestCase.assertTrue(main2.stopCalled); delay(); @@ -283,6 +287,8 @@ public class ControlListenerTest extends TestCase.assertEquals(3, new ControlListener(main, null).shutdownServer()); + delay(); + TestCase.assertFalse(main.stopCalled); TestCase.assertTrue(ctlFile1.exists()); @@ -298,6 +304,8 @@ public class ControlListenerTest extends TestCase.assertEquals(4, new ControlListener(main, String.valueOf(port)).shutdownServer()); + delay(); + TestCase.assertFalse(main.stopCalled); TestCase.assertFalse(ctlFile1.exists()); @@ -320,6 +328,8 @@ public class ControlListenerTest extends TestCase.assertEquals(4, new ControlListener(main, null).shutdownServer()); + delay(); + TestCase.assertFalse(main.stopCalled); TestCase.assertTrue(ctlFile1.exists());