Rebase onto latest s3-tests

Uncovered an issue with incorrect escaping.

.travis.yml

@@ -1,3 +1,4 @@
+dist: bionic
 version: ~> 1.0
 os: linux
 language: java
@@ -11,6 +12,7 @@ env:
     - REPO=andrewgaul/s3proxy
 addons:
   apt_packages:
+   - python3.6
    - python-pip
    - python-virtualenv
    - libevent-dev

s3-tests

@@ -1 +1 @@
-Subproject commit 8e97ba806c7293fc3da8ad51f66218160b9bb2b9
+Subproject commit f5d5faf49d1efc94cd8e976ec0fac33e6ed04c4e

src/main/java/org/gaul/s3proxy/S3ProxyHandler.java

@@ -183,7 +183,8 @@ public class S3ProxyHandler {
     private static final String XML_CONTENT_TYPE = "application/xml";
     private static final String UTF_8 = "UTF-8";
     /** URLEncoder escapes / which we do not want. */
-    private static final Escaper urlEscaper = new PercentEscaper("*-./_", true);
+    private static final Escaper urlEscaper = new PercentEscaper(
+            "*-./_", /*plusForSpace=*/ false);
     @SuppressWarnings("deprecation")
     private static final HashFunction MD5 = Hashing.md5();
 

src/test/resources/run-s3-tests.sh

@@ -37,4 +37,4 @@ done
 
 # execute s3-tests
 pushd s3-tests
-./virtualenv/bin/nosetests -a '!fails_on_s3proxy,!appendobject,!bucket-policy,!cors,!encryption,!fails_strict_rfc2616,!lifecycle,!object-lock,!policy,!s3website,!tagging,!versioning'
+./virtualenv/bin/nosetests -a '!fails_on_s3proxy,!appendobject,!bucket-policy,!cors,!encryption,!fails_strict_rfc2616,!lifecycle,!object-lock,!policy,!policy_status,!s3select,!s3website,!tagging,!user-policy,!versioning'

src/test/resources/s3-tests.conf

@@ -36,7 +36,6 @@ secret_key = local-credential
 ## another user account, used for ACL-related tests
 user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
 display_name = john.doe
-email = john.doe@example.com
 ## the "alt" user needs to have email set, too
 email = john.doe@example.com
 access_key = local-identity