You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2017/03/20 17:57:42 UTC
[1/3] brooklyn-server git commit: use http://httpbin instead of https
for tests
Repository: brooklyn-server
Updated Branches:
refs/heads/master afe274fcb -> 948a3703d
use http://httpbin instead of https for tests
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d85fc2b1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d85fc2b1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d85fc2b1
Branch: refs/heads/master
Commit: d85fc2b176175cf75096849789cd9d6ec3de0b0a
Parents: a0f8840
Author: Andrea Turli <an...@gmail.com>
Authored: Mon Mar 20 15:08:16 2017 +0100
Committer: Andrea Turli <an...@gmail.com>
Committed: Mon Mar 20 15:08:52 2017 +0100
----------------------------------------------------------------------
.../apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java | 2 +-
.../brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d85fc2b1/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java
index f114f23..f3cc4f3 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java
@@ -51,7 +51,7 @@ public class CompositeEffectorYamlTest extends AbstractYamlTest {
" 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",
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d85fc2b1/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java
index b36771c..77b11b1 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java
@@ -48,7 +48,7 @@ public class HttpCommandEffectorYamlTest extends AbstractYamlTest {
" 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"
@@ -60,7 +60,7 @@ public class HttpCommandEffectorYamlTest extends AbstractYamlTest {
// Invoke with parameters
{
- Object result = entity.invoke(effector, ImmutableMap.of("uri", "https://httpbin.org/get?pwd=passwd", "jsonPath", "$.args.pwd")).get();
+ Object result = entity.invoke(effector, ImmutableMap.of("uri", "http://httpbin.org/get?pwd=passwd", "jsonPath", "$.args.pwd")).get();
assertEquals(((String)result).trim(), "passwd");
}
[2/3] brooklyn-server git commit: mark tests as Integration
Posted by ge...@apache.org.
mark tests as Integration
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f540e743
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f540e743
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f540e743
Branch: refs/heads/master
Commit: f540e74364e1f437859a6fa873d026bbbef7c8ba
Parents: d85fc2b
Author: Andrea Turli <an...@gmail.com>
Authored: Mon Mar 20 18:27:27 2017 +0100
Committer: Andrea Turli <an...@gmail.com>
Committed: Mon Mar 20 18:27:27 2017 +0100
----------------------------------------------------------------------
.../apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java | 2 +-
.../apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f540e743/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java
index f3cc4f3..8d1ff0b 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java
@@ -37,7 +37,7 @@ import com.google.common.collect.Iterables;
public class CompositeEffectorYamlTest extends AbstractYamlTest {
private static final Logger log = LoggerFactory.getLogger(CompositeEffectorYamlTest.class);
- @Test
+ @Test(groups="Integration")
public void testCompositeEffector() throws Exception {
Entity app = createAndStartApplication(
"location: localhost",
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f540e743/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java
index 77b11b1..c1a1963 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java
@@ -34,7 +34,7 @@ import com.google.common.collect.Iterables;
public class HttpCommandEffectorYamlTest extends AbstractYamlTest {
private static final Logger log = LoggerFactory.getLogger(HttpCommandEffectorYamlTest.class);
- @Test
+ @Test(groups="Integration")
public void testHttpCommandEffectorWithParameters() throws Exception {
Entity app = createAndStartApplication(
"location: localhost",
[3/3] brooklyn-server git commit: Closes #599
Posted by ge...@apache.org.
Closes #599
use http://httpbin instead of https for tests
this should fix the build failures we are seeing after 16th March
cc @geomacy please have a look at this
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/948a3703
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/948a3703
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/948a3703
Branch: refs/heads/master
Commit: 948a3703d26ae3e9a8278a5b540c6c7964848c45
Parents: afe274f f540e74
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Mon Mar 20 17:56:55 2017 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Mon Mar 20 17:56:55 2017 +0000
----------------------------------------------------------------------
.../brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java | 4 ++--
.../brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------