From 83664acd89b67af306e08a8a07a978a1b18e7bef Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Tue, 2 Jul 2019 15:00:24 -0700 Subject: [PATCH] Rebase onto latest s3-tests --- s3-tests | 2 +- src/test/resources/run-s3-tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/s3-tests b/s3-tests index d93757b..244466f 160000 --- a/s3-tests +++ b/s3-tests @@ -1 +1 @@ -Subproject commit d93757bff5b6e4bb4bedd763e60b92cf2c901d38 +Subproject commit 244466f5a31e7c4ac64f00e41ea1e4dcf308e38c diff --git a/src/test/resources/run-s3-tests.sh b/src/test/resources/run-s3-tests.sh index 0285322..e8b367e 100755 --- a/src/test/resources/run-s3-tests.sh +++ b/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,!policy,!s3website,!tagging,!versioning' +./virtualenv/bin/nosetests -a '!fails_on_s3proxy,!appendobject,!bucket-policy,!cors,!encryption,!fails_strict_rfc2616,!lifecycle,!object-lock,!policy,!s3website,!tagging,!versioning'