mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Do not set endpoint in overrides 

Previously tests used the same endpoint for both client-s3proxy and
s3proxy-server.
pull/16/head
Andrew Gaul 2014-08-18 11:59:01 -07:00
rodzic c6a87d6816
commit ed971cdcbe
1 zmienionych plików z 4 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
src/test/java/org/gaul/s3proxy/S3ProxyTest.java
Wyświetl plik

@ -64,6 +64,8 @@ public final class S3ProxyTest {
s3ProxyProperties.load(is); s3ProxyProperties.load(is);
} }
String provider = s3ProxyProperties.getProperty(
Constants.PROPERTY_PROVIDER);
String identity = s3ProxyProperties.getProperty( String identity = s3ProxyProperties.getProperty(
Constants.PROPERTY_IDENTITY); Constants.PROPERTY_IDENTITY);
String credential = s3ProxyProperties.getProperty( String credential = s3ProxyProperties.getProperty(
@ -83,14 +85,9 @@ public final class S3ProxyTest {
String forceMultiPartUpload = s3ProxyProperties.getProperty( String forceMultiPartUpload = s3ProxyProperties.getProperty(
S3ProxyConstants.PROPERTY_FORCE_MULTI_PART_UPLOAD); S3ProxyConstants.PROPERTY_FORCE_MULTI_PART_UPLOAD);
Properties properties = new Properties();
properties.setProperty(Constants.PROPERTY_ENDPOINT,
s3Endpoint.toString());
ContextBuilder builder = ContextBuilder ContextBuilder builder = ContextBuilder
.newBuilder(s3ProxyProperties.getProperty( .newBuilder(provider)
Constants.PROPERTY_PROVIDER)) .credentials(identity, credential);
.credentials(identity, credential)
.overrides(properties);
if (!Strings.isNullOrEmpty(endpoint)) { if (!Strings.isNullOrEmpty(endpoint)) {
builder.endpoint(endpoint); builder.endpoint(endpoint);
} }