[brooklyn-server] branch master updated: fix failing docker/kubectl cli test

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new c0e3976129 fix failing docker/kubectl cli test
c0e3976129 is described below

commit c0e3976129642541e2ed13a751cfd52f27216d5f
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Mon Jun 27 17:25:35 2022 +0100

    fix failing docker/kubectl cli test
---
 .../java/org/apache/brooklyn/tasks/kubectl/DockerTaskTest.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/DockerTaskTest.java
 
b/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/DockerTaskTest.java
index 31084e8a9e..32e0d077c4 100644
--- 
a/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/DockerTaskTest.java
+++ 
b/software/base/src/test/java/org/apache/brooklyn/tasks/kubectl/DockerTaskTest.java
@@ -24,6 +24,7 @@ import org.apache.brooklyn.api.entity.EntitySpec;
 import org.apache.brooklyn.api.mgmt.Task;
 import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
 import org.apache.brooklyn.core.test.entity.TestEntity;
+import org.apache.brooklyn.test.Asserts;
 import org.apache.brooklyn.util.collections.MutableList;
 import org.apache.brooklyn.util.core.task.DynamicTasks;
 import org.apache.brooklyn.util.time.Duration;
@@ -62,7 +63,7 @@ public class DockerTaskTest extends 
BrooklynAppUnitTestSupport {
         assertTrue(res2.startsWith("hello test"));
     }
 
-    @Test
+    @Test(groups = "Integration") // tries to execute local command, wants it 
to fail but even so best as integration
     public void testFailingDockerTask() {
         TestEntity entity = 
app.createAndManageChild(EntitySpec.create(TestEntity.class));
 
@@ -79,10 +80,10 @@ public class DockerTaskTest extends 
BrooklynAppUnitTestSupport {
                 .newTask();
 
         try {
-            DynamicTasks.queueIfPossible(dockerTask).orSubmitAsync(entity);
+            
DynamicTasks.queueIfPossible(dockerTask).orSubmitAsync(entity).getTask().get();
+            Asserts.shouldHaveFailedPreviously();
         } catch (Exception e) {
-            assertTrue(e.getCause() instanceof ExecutionException);
-            assertTrue(e.getCause().getMessage().contains("Process task ended 
with exit code 1 when 0 was required"));
+            Asserts.expectedFailureContains(e, "Process task ended with exit 
code", "when 0 was required");
         }
     }