You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2016/07/11 09:25:57 UTC
[1/2] jclouds-labs-aws git commit: Do not assume an endpoint in tests.
Repository: jclouds-labs-aws
Updated Branches:
refs/heads/master 057824ff7 -> aeecbbb96
Do not assume an endpoint in tests.
jclouds should not assume a particular endpoint when running glacier
tests, as it's possible that a glacier emulator is used (e.g.
glacier-proxy).
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/commit/3d7b8750
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/tree/3d7b8750
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/diff/3d7b8750
Branch: refs/heads/master
Commit: 3d7b875099d7f9396e251204375452be8aef817e
Parents: 057824f
Author: Timur Alperovich <ti...@gmail.com>
Authored: Sun Jan 3 16:39:02 2016 -0800
Committer: Ignasi Barrera <na...@apache.org>
Committed: Mon Jul 11 11:23:05 2016 +0200
----------------------------------------------------------------------
.../test/java/org/jclouds/glacier/GlacierClientLiveTest.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/3d7b8750/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java
----------------------------------------------------------------------
diff --git a/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java b/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java
index e501a0e..3262d08 100644
--- a/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java
+++ b/glacier/src/test/java/org/jclouds/glacier/GlacierClientLiveTest.java
@@ -56,11 +56,9 @@ public class GlacierClientLiveTest extends BaseApiLiveTest<GlacierClient> {
@Test
public void testCreateVault() throws Exception {
- assertThat(api.createVault(VAULT_NAME1).toString())
- .contains("https://glacier.us-east-1.amazonaws.com/")
- .contains("/vaults/" + VAULT_NAME1);
- api.createVault(VAULT_NAME2);
- api.createVault(VAULT_NAME3);
+ assertThat(api.createVault(VAULT_NAME1).toString()).contains("/vaults/" + VAULT_NAME1);
+ assertThat(api.createVault(VAULT_NAME2).toString()).contains("/vaults/" + VAULT_NAME2);
+ assertThat(api.createVault(VAULT_NAME3).toString()).contains("/vaults/" + VAULT_NAME3);
}
@Test(dependsOnMethods = {"testCreateVault"})
[2/2] jclouds-labs-aws git commit: Add a system setting for Glacier's
initial wait.
Posted by na...@apache.org.
Add a system setting for Glacier's initial wait.
Glacier has an initial wait parameter, which is used to check on the
progress of a job. By default, it is set to 3 hours. This may work
well against existing AWS Glacier interface, however, against a
Glacier emulator the timeout should be overriden. The change allows
setting the timeout to an arbitrary shorter value with
-Dtest.glacier.initial-wait.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/commit/aeecbbb9
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/tree/aeecbbb9
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/diff/aeecbbb9
Branch: refs/heads/master
Commit: aeecbbb96bfbf2e66cadc9542ab706f962cb9e8e
Parents: 3d7b875
Author: Timur Alperovich <ti...@gmail.com>
Authored: Mon Jul 4 16:26:35 2016 -0700
Committer: Ignasi Barrera <na...@apache.org>
Committed: Mon Jul 11 11:23:08 2016 +0200
----------------------------------------------------------------------
.../glacier/blobstore/strategy/internal/BasePollingStrategy.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/aeecbbb9/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BasePollingStrategy.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BasePollingStrategy.java b/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BasePollingStrategy.java
index d02137b..eeb179f 100644
--- a/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BasePollingStrategy.java
+++ b/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BasePollingStrategy.java
@@ -48,7 +48,8 @@ public class BasePollingStrategy implements PollingStrategy {
@Inject
public BasePollingStrategy(GlacierClient client) {
- this(client, DEFAULT_INITIAL_WAIT, DEFAULT_TIME_BETWEEN_POLLS);
+ this(client, Long.parseLong(System.getProperty("test.glacier.initial-wait",
+ Long.toString(DEFAULT_INITIAL_WAIT))), DEFAULT_TIME_BETWEEN_POLLS);
}
private boolean inProgress(String job, String vault) {