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/04/28 13:53:40 UTC
[02/10] brooklyn-server git commit: lower big timeouts in
DefaultConnectivityResolverTest
lower big timeouts in DefaultConnectivityResolverTest
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/20f4908c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/20f4908c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/20f4908c
Branch: refs/heads/master
Commit: 20f4908c94a46c19a85cbbea0891b652cbfc99dc
Parents: f9cb0b2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Apr 25 15:06:47 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Apr 28 14:09:50 2017 +0100
----------------------------------------------------------------------
.../DefaultConnectivityResolverTest.java | 25 ++++++++++----------
1 file changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/20f4908c/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java
index 33a019a..8b1bc5b 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java
@@ -68,7 +68,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
JcloudsLocationConfig.LOOKUP_AWS_HOSTNAME, true));
ConnectivityResolverOptions options = newResolveOptions()
.waitForConnectable(true)
- .pollForReachableAddresses(Predicates.<HostAndPort>alwaysTrue(), Duration.ONE_SECOND, true)
+ .pollForReachableAddresses(Predicates.<HostAndPort>alwaysTrue(), Duration.millis(1), true)
.userCredentials(credential)
.build();
DefaultConnectivityResolver customizer = new DefaultConnectivityResolver();
@@ -92,7 +92,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
initNodeCreatorAndJcloudsLocation(newNodeCreator(), ImmutableMap.of());
DefaultConnectivityResolver customizer = new DefaultConnectivityResolver();
final ConfigBag config = ConfigBag.newInstance(ImmutableMap.of(
- JcloudsLocationConfig.WAIT_FOR_SSHABLE, "1ms"));
+ JcloudsLocationConfig.POLL_FOR_FIRST_REACHABLE_ADDRESS, "1ms"));
assertTrue(customizer.checkCredential(
jcloudsLocation, HostAndPort.fromParts("10.0.0.234", 22),
LoginCredentials.builder().user(allowedUser).password("password1").build(), config, false));
@@ -114,7 +114,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
initNodeCreatorAndJcloudsLocation(newNodeCreator(), ImmutableMap.of());
DefaultConnectivityResolver customizer = new DefaultConnectivityResolver();
final ConfigBag config = ConfigBag.newInstance(ImmutableMap.of(
- JcloudsLocationConfig.WAIT_FOR_WINRM_AVAILABLE, "1ms"));
+ JcloudsLocationConfig.POLL_FOR_FIRST_REACHABLE_ADDRESS, "1ms"));
assertTrue(customizer.checkCredential(
jcloudsLocation, HostAndPort.fromParts("10.0.0.234", 22),
LoginCredentials.builder().user(allowedUser).password("password1").build(), config, true));
@@ -146,11 +146,9 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
});
ConfigBag config = ConfigBag.newInstance(ImmutableMap.of(
JcloudsLocationConfig.LOOKUP_AWS_HOSTNAME, false,
- JcloudsLocationConfig.WAIT_FOR_SSHABLE, "1ms",
+ JcloudsLocationConfig.POLL_FOR_FIRST_REACHABLE_ADDRESS, "1ms",
JcloudsLocation.CUSTOM_CREDENTIALS, credential));
- ConnectivityResolverOptions options = newResolveOptions()
- .pollForReachableAddresses(Predicates.in(reachableIps), Duration.ONE_SECOND, true)
- .build();
+ ConnectivityResolverOptions options = newResolveOptionsForIps(reachableIps).build();
// Chooses authorisedHostAndPort when credentials are tested.
DefaultConnectivityResolver customizer = new DefaultConnectivityResolver(ImmutableMap.of(
@@ -192,9 +190,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
initNodeCreatorAndJcloudsLocation(newNodeCreator(), ImmutableMap.of(
JcloudsLocationConfig.CONNECTIVITY_RESOLVER, customizer));
- ConnectivityResolverOptions options = newResolveOptions()
- .pollForReachableAddresses(Predicates.in(reachableIps), Duration.ONE_SECOND, true)
- .build();
+ ConnectivityResolverOptions options = newResolveOptionsForIps(reachableIps).build();
ConfigBag configBag = ConfigBag.newInstance();
ManagementAddressResolveResult result = customizer.resolve(jcloudsLocation, newNodeMetadata(), configBag, options);
@@ -223,9 +219,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
initNodeCreatorAndJcloudsLocation(newNodeCreator(), ImmutableMap.of(
JcloudsLocationConfig.CONNECTIVITY_RESOLVER, customizer));
- ConnectivityResolverOptions options = newResolveOptions()
- .pollForReachableAddresses(Predicates.in(reachableIps), Duration.ONE_SECOND, true)
- .build();
+ ConnectivityResolverOptions options = newResolveOptionsForIps(reachableIps).build();
ConfigBag configBag = ConfigBag.newInstance();
customizer.resolve(jcloudsLocation, newNodeMetadata(), configBag, options);
}
@@ -234,6 +228,11 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
return ConnectivityResolverOptions.builder()
.initialCredentials(credential);
}
+
+ private ConnectivityResolverOptions.Builder newResolveOptionsForIps(Set<HostAndPort> reachableIps) {
+ return newResolveOptions().
+ pollForReachableAddresses(Predicates.in(reachableIps), Duration.millis(1), true);
+ }
private NodeMetadata newNodeMetadata() {
return new NodeMetadataBuilder()