brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geom...@apache.org
Subject [1/2] brooklyn-server git commit: Make a couple more tests be integration tests.
Date Mon, 20 Mar 2017 19:02:49 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 948a3703d -> b34e25697


Make a couple more tests be integration tests.

See https://github.com/apache/brooklyn-server/pull/599


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

Branch: refs/heads/master
Commit: e1310ac18b61a9bdbfc899475a3a5259ada99a57
Parents: 948a370
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Authored: Mon Mar 20 18:14:44 2017 +0000
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Committed: Mon Mar 20 18:14:44 2017 +0000

----------------------------------------------------------------------
 .../brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java  | 4 ++--
 .../camp/brooklyn/HttpCommandEffectorYamlRebindTest.java         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e1310ac1/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java
index 09a9075..530abf6 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java
@@ -57,7 +57,7 @@ public class CompositeEffectorYamlRebindTest extends AbstractYamlRebindTest
{
            "      brooklyn.config:",
            "        name: myEffector",
            "        description: myDescription",
-           "        uri: https://httpbin.org/get?id=myId",
+           "        uri: http://httpbin.org/get?id=myId",
            "        httpVerb: GET",
            "        jsonPath: $.args.id",
            "        publishSensor: results",
@@ -69,7 +69,7 @@ public class CompositeEffectorYamlRebindTest extends AbstractYamlRebindTest
{
            "        - myEffector"
    );
 
-   @Test
+    @Test(groups="Integration")
    public void testRebindWhenHealthy() throws Exception {
       runRebindWhenIsUp(catalogYamlSimple, appVersionedId);
    }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e1310ac1/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlRebindTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlRebindTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlRebindTest.java
index df57bcb..96db7d9 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlRebindTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlRebindTest.java
@@ -54,12 +54,12 @@ public class HttpCommandEffectorYamlRebindTest extends AbstractYamlRebindTest
{
            "        brooklyn.config:",
            "          name: myEffector",
            "          description: myDescription",
-           "          uri: https://httpbin.org/get?id=myId",
+           "          uri: http://httpbin.org/get?id=myId",
            "          httpVerb: GET",
            "          jsonPath: $.args.id",
            "          publishSensor: results");
 
-   @Test
+   @Test(groups="Integration")
    public void testRebindWhenHealthy() throws Exception {
       runRebindWhenIsUp(catalogYamlSimple, appVersionedId);
    }


Mime
View raw message