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
commit 8c98f10fd7f70211b18cd61dc77b30336c491f60 Author: Alex Heneveld <[email protected]> AuthorDate: Tue Sep 14 14:43:30 2021 +0100 fix tests which previously only passed due to scheduled tasks not being cancelled! --- .../org/apache/brooklyn/feed/windows/WinRmCommandSensorTest.java | 8 +++++--- .../feed/windows/WindowsPerformanceCounterSensorsTest.java | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WinRmCommandSensorTest.java b/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WinRmCommandSensorTest.java index 7bf481c..75e10c4 100644 --- a/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WinRmCommandSensorTest.java +++ b/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WinRmCommandSensorTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixtureWithApp; import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.sensor.http.HttpRequestSensor; import org.apache.brooklyn.core.sensor.windows.WinRmCommandSensor; +import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.location.winrm.WinRmMachineLocation; import org.apache.brooklyn.test.Asserts; @@ -77,9 +78,10 @@ public class WinRmCommandSensorTest extends RebindTestFixtureWithApp { app().start(ImmutableList.of(loc)); EntityAsserts.assertAttributeEqualsEventually(entity, Sensors.newStringSensor("mysensor"), "myval"); - - rebind(); - + + TestApplication app2 = rebind(); + + entity = app2.getChildren().iterator().next(); RecordingWinRmTool.setCustomResponse(".*mycommand.*", new RecordingWinRmTool.CustomResponse(0, "myval2", "")); EntityAsserts.assertAttributeEqualsEventually(entity, Sensors.newStringSensor("mysensor"), "myval2"); } diff --git a/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterSensorsTest.java b/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterSensorsTest.java index 5df4f5c..744c84c 100644 --- a/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterSensorsTest.java +++ b/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterSensorsTest.java @@ -81,10 +81,12 @@ public class WindowsPerformanceCounterSensorsTest extends RebindTestFixtureWithA "counter", "\\mycounter"))))))); app().start(ImmutableList.of(loc)); - + entity = app().getChildren().iterator().next(); + EntityAsserts.assertAttributeEqualsEventually(entity, Sensors.newStringSensor("mysensor"), "myval"); - + rebind(); + entity = app().getChildren().iterator().next(); String response2 = generateCounterReponse("mycounter", "myval2"); RecordingWinRmTool.setCustomResponse(".*mycounter.*", new RecordingWinRmTool.CustomResponse(0, response2, ""));
