You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/07/03 01:26:29 UTC
jclouds git commit: Use correct default in testPublicAccess
Repository: jclouds
Updated Branches:
refs/heads/master bc9cda2e3 -> bf93cadec
Use correct default in testPublicAccess
Regression from d57b6e7b8f22caa29eae9b9677fa039d607cabb1.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/bf93cade
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/bf93cade
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/bf93cade
Branch: refs/heads/master
Commit: bf93cadec67d8300b9afba68a5ab13e0c24d88d2
Parents: bc9cda2
Author: Andrew Gaul <ga...@apache.org>
Authored: Thu Jul 2 16:25:49 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Thu Jul 2 16:25:49 2015 -0700
----------------------------------------------------------------------
.../blobstore/integration/internal/BaseContainerLiveTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/bf93cade/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
----------------------------------------------------------------------
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
index 48bebb2..bbb4369 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerLiveTest.java
@@ -83,7 +83,8 @@ public class BaseContainerLiveTest extends BaseBlobStoreIntegrationTest {
SocketOpen socketOpen = context.utils().injector().getInstance(SocketOpen.class);
Predicate<HostAndPort> socketTester = retry(socketOpen, 60, 5, SECONDS);
- HostAndPort hostAndPort = HostAndPort.fromParts(metadata.getPublicUri().getHost(), metadata.getPublicUri().getPort());
+ int port = metadata.getPublicUri().getPort();
+ HostAndPort hostAndPort = HostAndPort.fromParts(metadata.getPublicUri().getHost(), port != -1 ? port : 80);
assertTrue(socketTester.apply(hostAndPort), metadata.getPublicUri().toString());
assertEquals(Strings2.toStringAndClose(view.utils().http().get(metadata.getPublicUri())), TEST_STRING);