Clocker-testing: fix where we delete the location Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b59fda75 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b59fda75 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b59fda75
Branch: refs/heads/master Commit: b59fda75be280dee68e44115d9ca2112e8404658 Parents: b5dae5b Author: Aled Sage <[email protected]> Authored: Tue Mar 22 12:48:01 2016 +0000 Committer: Aled Sage <[email protected]> Committed: Tue Mar 22 12:48:01 2016 +0000 ---------------------------------------------------------------------- .../location/dynamic/clocker/StubContainerImpl.java | 8 ++++++++ .../core/location/dynamic/clocker/StubHostImpl.java | 16 ++++++++++++++++ .../dynamic/clocker/StubInfrastructureImpl.java | 6 ++++-- 3 files changed, 28 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b59fda75/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubContainerImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubContainerImpl.java b/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubContainerImpl.java index 45cf9d0..2ef9480 100644 --- a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubContainerImpl.java +++ b/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubContainerImpl.java @@ -27,11 +27,13 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.mgmt.LocationManager; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; +import org.apache.brooklyn.core.entity.trait.StartableMethods; import org.apache.brooklyn.core.feed.ConfigToAttributes; import org.apache.brooklyn.core.location.dynamic.DynamicLocation; import org.apache.brooklyn.entity.stock.BasicStartableImpl; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,6 +76,12 @@ public class StubContainerImpl extends BasicStartableImpl implements StubContain } @Override + public void stop() { + super.stop(); + deleteLocation(); + } + + @Override public StubContainerLocation createLocation(Map<String, ?> flags) { StubHost dockerHost = getDockerHost(); StubHostLocation host = dockerHost.getDynamicLocation(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b59fda75/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubHostImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubHostImpl.java b/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubHostImpl.java index 3139d93..314ebda 100644 --- a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubHostImpl.java +++ b/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubHostImpl.java @@ -19,10 +19,15 @@ package org.apache.brooklyn.core.location.dynamic.clocker; import java.util.Map; +import java.util.Set; +import org.apache.brooklyn.api.entity.Application; +import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.LocationDefinition; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.feed.ConfigToAttributes; import org.apache.brooklyn.core.location.Locations; import org.apache.brooklyn.core.location.Machines; @@ -31,9 +36,14 @@ import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.software.base.EmptySoftwareProcessImpl; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.collections.QuorumCheck.QuorumChecks; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; + public class StubHostImpl extends EmptySoftwareProcessImpl implements StubHost { private static final Logger LOG = LoggerFactory.getLogger(StubHostImpl.class); @@ -83,6 +93,12 @@ public class StubHostImpl extends EmptySoftwareProcessImpl implements StubHost { } @Override + public void postStop() { + super.postStop(); + deleteLocation(); + } + + @Override public StubHostLocation createLocation(Map<String, ?> flags) { StubInfrastructure infrastructure = getInfrastructure(); StubInfrastructureLocation docker = infrastructure.getDynamicLocation(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b59fda75/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubInfrastructureImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubInfrastructureImpl.java b/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubInfrastructureImpl.java index 0f578bc..05367c4 100644 --- a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubInfrastructureImpl.java +++ b/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/StubInfrastructureImpl.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityPredicates; +import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.feed.ConfigToAttributes; import org.apache.brooklyn.core.location.Locations; @@ -132,6 +133,7 @@ public class StubInfrastructureImpl extends AbstractApplication implements StubI */ @Override public void stop() { + setExpectedStateAndRecordLifecycleEvent(Lifecycle.STOPPING); sensors().set(SERVICE_UP, Boolean.FALSE); // Find all applications and stop, blocking for up to five minutes until ended @@ -158,10 +160,10 @@ public class StubInfrastructureImpl extends AbstractApplication implements StubI LOG.warn("Error stopping hosts", e); } + deleteLocation(); + // Stop anything else left over super.stop(); - - deleteLocation(); } @Override
