brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [05/50] brooklyn-library git commit: fix integration test undeploy argument
Date Mon, 01 Feb 2016 17:46:08 GMT
fix integration test undeploy argument


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

Branch: refs/heads/0.4.0
Commit: 98c29a33601b4218253a080ef0ad562927ad0bdd
Parents: 22de8c5
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Sep 20 18:25:03 2012 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Sep 20 18:25:03 2012 +0100

----------------------------------------------------------------------
 .../java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java    | 3 ++-
 .../test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/98c29a33/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java
b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java
index 5c3c430..ffc98db 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java
@@ -124,7 +124,8 @@ public abstract class JavaWebAppSoftwareProcess extends SoftwareProcessEntity
im
         }
     }
 
-    @Description("Undeploys the given artifact")
+    /** For the DEPLOYED_WARS to be updated, the input must match the result of the call
to deploy */ 
+    @Description("Undeploys the given context/artifact")
     public void undeploy(
             @NamedParameter("targetName") String targetName) {
         try {

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/98c29a33/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
b/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
index aed1b2f..326c6a2 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
@@ -418,7 +418,7 @@ public class WebAppIntegrationTest {
         }
         
         // And undeploying
-        entity.undeploy("myartifactname.war")
+        entity.undeploy("/myartifactname")
         executeUntilSucceeds(abortOnError:false, timeout:60*SECONDS) {
             // TODO get this URL from a WAR file entity
             assertEquals(urlRespondsStatusCode(entity.getAttribute(WebAppService.ROOT_URL)+"myartifactname"+urlSubPathToPageToQuery),
404);


Mime
View raw message