You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@twill.apache.org by ch...@apache.org on 2014/07/29 08:24:47 UTC

[1/5] git commit: Longer wait time for the first log.

Repository: incubator-twill
Updated Branches:
  refs/heads/feature/travis-build b75c5b2e9 -> 69dbd5b3a


Longer wait time for the first log.

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

Branch: refs/heads/feature/travis-build
Commit: bc6072429938acdb0a631306ecedbf8367cfea27
Parents: b75c5b2
Author: Terence Yim <te...@continuuity.com>
Authored: Mon Jul 28 21:49:43 2014 -0700
Committer: Terence Yim <te...@continuuity.com>
Committed: Mon Jul 28 21:49:43 2014 -0700

----------------------------------------------------------------------
 .../src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/bc607242/twill-yarn/src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java
----------------------------------------------------------------------
diff --git a/twill-yarn/src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java b/twill-yarn/src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java
index f5ead6b..a566515 100644
--- a/twill-yarn/src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java
+++ b/twill-yarn/src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java
@@ -69,7 +69,7 @@ public class LogHandlerTestRun extends BaseYarnTest {
                                        .start();
 
     Services.getCompletionFuture(controller).get();
-    latch.await(1, TimeUnit.SECONDS);
+    Assert.assertTrue(latch.await(30, TimeUnit.SECONDS));
 
     // Verify the log throwable
     Assert.assertEquals(1, throwables.size());


[2/5] git commit: Increase time limit for testing.

Posted by ch...@apache.org.
Increase time limit for testing.

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

Branch: refs/heads/feature/travis-build
Commit: da9e0665ae733814d69354499029d020ad104cb5
Parents: bc60724
Author: Terence Yim <te...@continuuity.com>
Authored: Mon Jul 28 22:18:04 2014 -0700
Committer: Terence Yim <te...@continuuity.com>
Committed: Mon Jul 28 22:18:04 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/twill/yarn/LogHandlerTestRun.java     |  2 +-
 .../java/org/apache/twill/yarn/ResourceReportTestRun.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/da9e0665/twill-yarn/src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java
----------------------------------------------------------------------
diff --git a/twill-yarn/src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java b/twill-yarn/src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java
index a566515..8a60174 100644
--- a/twill-yarn/src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java
+++ b/twill-yarn/src/test/java/org/apache/twill/yarn/LogHandlerTestRun.java
@@ -69,7 +69,7 @@ public class LogHandlerTestRun extends BaseYarnTest {
                                        .start();
 
     Services.getCompletionFuture(controller).get();
-    Assert.assertTrue(latch.await(30, TimeUnit.SECONDS));
+    Assert.assertTrue(latch.await(100, TimeUnit.SECONDS));
 
     // Verify the log throwable
     Assert.assertEquals(1, throwables.size());

http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/da9e0665/twill-yarn/src/test/java/org/apache/twill/yarn/ResourceReportTestRun.java
----------------------------------------------------------------------
diff --git a/twill-yarn/src/test/java/org/apache/twill/yarn/ResourceReportTestRun.java b/twill-yarn/src/test/java/org/apache/twill/yarn/ResourceReportTestRun.java
index 71bb607..e402042 100644
--- a/twill-yarn/src/test/java/org/apache/twill/yarn/ResourceReportTestRun.java
+++ b/twill-yarn/src/test/java/org/apache/twill/yarn/ResourceReportTestRun.java
@@ -155,10 +155,10 @@ public final class ResourceReportTestRun extends BaseYarnTest {
       }
     }, Threads.SAME_THREAD_EXECUTOR);
 
-    Assert.assertTrue(running.await(30, TimeUnit.SECONDS));
+    Assert.assertTrue(running.await(120, TimeUnit.SECONDS));
 
     Iterable<Discoverable> echoServices = controller.discoverService("echo");
-    Assert.assertTrue(YarnTestUtils.waitForSize(echoServices, 2, 60));
+    Assert.assertTrue(YarnTestUtils.waitForSize(echoServices, 2, 120));
     // check that we have 2 runnables.
     ResourceReport report = controller.getResourceReport();
     Assert.assertEquals(2, report.getRunnableResources("BuggyServer").size());
@@ -176,7 +176,7 @@ public final class ResourceReportTestRun extends BaseYarnTest {
 
     // takes some time for app master to find out the container completed...
     int count = 0;
-    while (count < 20) {
+    while (count < 100) {
       report = controller.getResourceReport();
       // check that we have 1 runnable, not 2.
       if (report.getRunnableResources("BuggyServer").size() == 1) {
@@ -188,7 +188,7 @@ public final class ResourceReportTestRun extends BaseYarnTest {
     }
     Assert.assertTrue("Still has 2 contains running after 20 seconds", count < 20);
 
-    controller.stop().get(30, TimeUnit.SECONDS);
+    controller.stop().get(100, TimeUnit.SECONDS);
     // Sleep a bit before exiting.
     TimeUnit.SECONDS.sleep(2);
   }
@@ -217,7 +217,7 @@ public final class ResourceReportTestRun extends BaseYarnTest {
 
     // wait for 3 echo servers to come up
     Iterable<Discoverable> echoServices = controller.discoverService("echo");
-    Assert.assertTrue(YarnTestUtils.waitForSize(echoServices, 3, 60));
+    Assert.assertTrue(YarnTestUtils.waitForSize(echoServices, 3, 120));
     ResourceReport report = controller.getResourceReport();
     // make sure resources for echo1 and echo2 are there
     Map<String, Collection<TwillRunResources>> usedResources = report.getResources();


[4/5] git commit: Increase memory for test run

Posted by ch...@apache.org.
Increase memory for test run

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

Branch: refs/heads/feature/travis-build
Commit: e5c197fa05e87172df44baef713c29d844101ed4
Parents: ecb259c
Author: Terence Yim <ch...@apache.org>
Authored: Mon Jul 28 23:05:09 2014 -0700
Committer: Terence Yim <ch...@apache.org>
Committed: Mon Jul 28 23:05:09 2014 -0700

----------------------------------------------------------------------
 .travis.yml                                           |  2 +-
 .../org/apache/twill/yarn/ResourceReportTestRun.java  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/e5c197fa/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2468cd7..c6bdfce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ branches:
     - /^branch\-.*$/
     - /^feature\/.*$/
 
-script: mvn test -P $PROFILE -Dsurefire.redirectTestOutputToFile=false
+script: mvn test -P $PROFILE
 
 install: mvn install -P $PROFILE -DskipTests=true
 

http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/e5c197fa/twill-yarn/src/test/java/org/apache/twill/yarn/ResourceReportTestRun.java
----------------------------------------------------------------------
diff --git a/twill-yarn/src/test/java/org/apache/twill/yarn/ResourceReportTestRun.java b/twill-yarn/src/test/java/org/apache/twill/yarn/ResourceReportTestRun.java
index e402042..b800f02 100644
--- a/twill-yarn/src/test/java/org/apache/twill/yarn/ResourceReportTestRun.java
+++ b/twill-yarn/src/test/java/org/apache/twill/yarn/ResourceReportTestRun.java
@@ -66,11 +66,11 @@ public final class ResourceReportTestRun extends BaseYarnTest {
         .withRunnable()
           .add("echo1", new EchoServer(), ResourceSpecification.Builder.with()
             .setVirtualCores(1)
-            .setMemory(128, ResourceSpecification.SizeUnit.MEGA)
+            .setMemory(256, ResourceSpecification.SizeUnit.MEGA)
             .setInstances(2).build()).noLocalFiles()
           .add("echo2", new EchoServer(), ResourceSpecification.Builder.with()
             .setVirtualCores(2)
-            .setMemory(256, ResourceSpecification.SizeUnit.MEGA)
+            .setMemory(512, ResourceSpecification.SizeUnit.MEGA)
             .setInstances(1).build()).noLocalFiles()
         .anyOrder()
         .build();
@@ -138,7 +138,7 @@ public final class ResourceReportTestRun extends BaseYarnTest {
 
     ResourceSpecification resourceSpec = ResourceSpecification.Builder.with()
       .setVirtualCores(1)
-      .setMemory(128, ResourceSpecification.SizeUnit.MEGA)
+      .setMemory(256, ResourceSpecification.SizeUnit.MEGA)
       .setInstances(2)
       .build();
     TwillController controller = runner.prepare(new BuggyServer(), resourceSpec)
@@ -230,7 +230,7 @@ public final class ResourceReportTestRun extends BaseYarnTest {
     Assert.assertEquals(2, echo1Resources.size());
     // TODO: check cores after hadoop-2.1.0
     for (TwillRunResources resources : echo1Resources) {
-      Assert.assertEquals(128, resources.getMemoryMB());
+      Assert.assertEquals(256, resources.getMemoryMB());
     }
 
     Collection<TwillRunResources> echo2Resources = usedResources.get("echo2");
@@ -238,7 +238,7 @@ public final class ResourceReportTestRun extends BaseYarnTest {
     Assert.assertEquals(1, echo2Resources.size());
     // TODO: check cores after hadoop-2.1.0
     for (TwillRunResources resources : echo2Resources) {
-      Assert.assertEquals(256, resources.getMemoryMB());
+      Assert.assertEquals(512, resources.getMemoryMB());
     }
 
     // Decrease number of instances of echo1 from 2 to 1
@@ -258,7 +258,7 @@ public final class ResourceReportTestRun extends BaseYarnTest {
     Assert.assertEquals(1, echo1Resources.size());
     // TODO: check cores after hadoop-2.1.0
     for (TwillRunResources resources : echo1Resources) {
-      Assert.assertEquals(128, resources.getMemoryMB());
+      Assert.assertEquals(256, resources.getMemoryMB());
     }
 
     echo2Resources = usedResources.get("echo2");
@@ -266,7 +266,7 @@ public final class ResourceReportTestRun extends BaseYarnTest {
     Assert.assertEquals(1, echo2Resources.size());
     // TODO: check cores after hadoop-2.1.0
     for (TwillRunResources resources : echo2Resources) {
-      Assert.assertEquals(256, resources.getMemoryMB());
+      Assert.assertEquals(512, resources.getMemoryMB());
     }
 
     controller.stop().get(30, TimeUnit.SECONDS);


[3/5] git commit: Show output to stdout for travis run.

Posted by ch...@apache.org.
Show output to stdout for travis run.

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

Branch: refs/heads/feature/travis-build
Commit: ecb259c15ec3e99648e50f46111c383b4c623f29
Parents: da9e066
Author: Terence Yim <te...@continuuity.com>
Authored: Mon Jul 28 22:45:09 2014 -0700
Committer: Terence Yim <te...@continuuity.com>
Committed: Mon Jul 28 22:45:09 2014 -0700

----------------------------------------------------------------------
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/ecb259c1/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c6bdfce..2468cd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ branches:
     - /^branch\-.*$/
     - /^feature\/.*$/
 
-script: mvn test -P $PROFILE
+script: mvn test -P $PROFILE -Dsurefire.redirectTestOutputToFile=false
 
 install: mvn install -P $PROFILE -DskipTests=true
 


[5/5] git commit: Keep trying.

Posted by ch...@apache.org.
Keep trying.

Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/69dbd5b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/69dbd5b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/69dbd5b3

Branch: refs/heads/feature/travis-build
Commit: 69dbd5b3a6948141ca8e6e7307242a4f4d51da5c
Parents: e5c197f
Author: Terence Yim <ch...@apache.org>
Authored: Mon Jul 28 23:24:38 2014 -0700
Committer: Terence Yim <ch...@apache.org>
Committed: Mon Jul 28 23:24:38 2014 -0700

----------------------------------------------------------------------
 .travis.yml | 2 +-
 pom.xml     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/69dbd5b3/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c6bdfce..2468cd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ branches:
     - /^branch\-.*$/
     - /^feature\/.*$/
 
-script: mvn test -P $PROFILE
+script: mvn test -P $PROFILE -Dsurefire.redirectTestOutputToFile=false
 
 install: mvn install -P $PROFILE -DskipTests=true
 

http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/69dbd5b3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ba1900..98f531e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,6 +344,8 @@
                     <systemPropertyVariables>
                         <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
                     </systemPropertyVariables>
+                    <reuseForks>false</reuseForks>
+                    <reportFormat>plain</reportFormat>
                     <includes>
                         <include>**/*TestSuite.java</include>
                         <include>**/Test*.java</include>