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/04/09 08:21:41 UTC
[11/16] jclouds git commit: JCLOUDS-651: Fix filesystem integration
tests in OSX
JCLOUDS-651: Fix filesystem integration tests in OSX
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4e37ffb6
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4e37ffb6
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4e37ffb6
Branch: refs/heads/1.9.x
Commit: 4e37ffb6b6502e5ccd6df516380168155cc7d8e8
Parents: 211b073
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Apr 7 10:51:33 2015 +0200
Committer: Andrew Gaul <ga...@apache.org>
Committed: Wed Apr 8 23:13:53 2015 -0700
----------------------------------------------------------------------
.../blobstore/integration/internal/BaseBlobIntegrationTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/4e37ffb6/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
----------------------------------------------------------------------
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
index 1be2597..12e83c3 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
@@ -760,7 +760,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
Closeables2.closeQuietly(is);
}
checkContentMetadata(toBlob);
- assertThat(toBlob.getMetadata().getUserMetadata()).isEqualTo(userMetadata);
+ checkUserMetadata(toBlob.getMetadata().getUserMetadata(), userMetadata);
} finally {
returnContainer(toContainer);
returnContainer(fromContainer);
@@ -799,7 +799,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
// TODO: S3 overrideMetadataWith also overrides system metadata
// TODO: Swift does not preserve system metadata
//checkContentMetadata(toBlob);
- assertThat(toBlob.getMetadata().getUserMetadata()).isEqualTo(userMetadata);
+ checkUserMetadata(toBlob.getMetadata().getUserMetadata(), userMetadata);
} finally {
returnContainer(toContainer);
returnContainer(fromContainer);