brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [2/4] git commit: Skip UNIX-specific tests so all tests pass on Windows.
Date Wed, 09 Jul 2014 20:24:07 GMT
Skip UNIX-specific tests so all tests pass on Windows.


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

Branch: refs/heads/master
Commit: 2b43e98624a9fd97f0a80e6be6113eaca82ad905
Parents: f465674
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Wed Jun 25 15:52:51 2014 +0300
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Tue Jul 1 18:45:27 2014 +0300

----------------------------------------------------------------------
 .../ssh/process/ProcessToolIntegrationTest.java         |  2 +-
 pom.xml                                                 |  2 +-
 .../java/brooklyn/qa/longevity/MonitorUtilsTest.groovy  | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2b43e986/core/src/test/java/brooklyn/util/internal/ssh/process/ProcessToolIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/internal/ssh/process/ProcessToolIntegrationTest.java
b/core/src/test/java/brooklyn/util/internal/ssh/process/ProcessToolIntegrationTest.java
index 4b21e6a..df5c730 100644
--- a/core/src/test/java/brooklyn/util/internal/ssh/process/ProcessToolIntegrationTest.java
+++ b/core/src/test/java/brooklyn/util/internal/ssh/process/ProcessToolIntegrationTest.java
@@ -24,7 +24,7 @@ public class ProcessToolIntegrationTest extends ShellToolAbstractTest {
     // ones here included as *non*-integration tests. must run on windows and linux.
     // (also includes integration tests from parent)
 
-    @Test
+    @Test(groups="UNIX")
     public void testPortableCommand() throws Exception {
         String out = execScript("echo hello world");
         assertTrue(out.contains("hello world"), "out="+out);

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2b43e986/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2052356..f48fd43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
         <hazelcast.version>3.0</hazelcast.version>
 
         <includedTestGroups />
-        <excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
+        <excludedTestGroups>Integration,Acceptance,Live,WIP,UNIX</excludedTestGroups>
 
         <!-- no passphrase by default, so we can do automated deploy builds;
              you can still supply your own passphrase with -Dgpg.passphrase=XXX -->

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2b43e986/usage/qa/src/test/java/brooklyn/qa/longevity/MonitorUtilsTest.groovy
----------------------------------------------------------------------
diff --git a/usage/qa/src/test/java/brooklyn/qa/longevity/MonitorUtilsTest.groovy b/usage/qa/src/test/java/brooklyn/qa/longevity/MonitorUtilsTest.groovy
index a645bda..e09c8a5 100644
--- a/usage/qa/src/test/java/brooklyn/qa/longevity/MonitorUtilsTest.groovy
+++ b/usage/qa/src/test/java/brooklyn/qa/longevity/MonitorUtilsTest.groovy
@@ -16,7 +16,7 @@ import brooklyn.qa.longevity.MonitorUtilsTest;
 
 class MonitorUtilsTest {
 
-    @Test(enabled=false) // Demonstrates that process.waitFor() hangs for big output streams
+    @Test(enabled=false, groups="UNIX") // Demonstrates that process.waitFor() hangs for
big output streams
     public void testGroovyExecuteAndWaitFor() {
         String bigstr = Strings.repeat("a", 100000)
         def process = "echo $bigstr".execute()
@@ -25,7 +25,7 @@ class MonitorUtilsTest {
         assertTrue(out.contains(bigstr), "out.size="+out.length())
     }
 
-    @Test
+    @Test(groups="UNIX")
     public void testGroovyExecuteAndWaitForConsumingOutputStream() {
         String bigstr = Strings.repeat("a", 100000)
         def process = "echo $bigstr".execute()
@@ -33,14 +33,14 @@ class MonitorUtilsTest {
         assertTrue(out.contains(bigstr), "out.size="+out.length())
     }
 
-    @Test
+    @Test(groups="UNIX")
     public void testFindOwnPid() {
         int ownpid = MonitorUtils.findOwnPid()
         assertTrue(ownpid > 0, "ownpid=$ownpid")
         assertTrue(MonitorUtils.isPidRunning(ownpid, "java"),"java is not running")
     }
             
-    @Test
+    @Test(groups="UNIX")
     public void testIsPidRunning() {
         int usedPid = MonitorUtils.findOwnPid()
         
@@ -60,7 +60,7 @@ class MonitorUtilsTest {
         assertFalse(MonitorUtils.isPidRunning(1234567)) // too large
     }
     
-    @Test
+    @Test(groups="UNIX")
     public void testGetRunningPids() {
         int ownpid = MonitorUtils.findOwnPid()
 
@@ -74,7 +74,7 @@ class MonitorUtilsTest {
         assertFalse(MonitorUtils.isUrlUp(new URL("http://localhost/thispathdoesnotexist")))
     }
     
-    @Test
+    @Test(groups="UNIX")
     public void testSearchLog() {
         String fileContents = "line1\nline2\nline3\n"
         File file = File.createTempFile("monitorUtilsTest.testSearchLog", ".txt")


Mime
View raw message