kopia lustrzana https://github.com/gaul/s3proxy
Clean up tags in s3-tests
Fix an off-by-one error in NIO.2 previously hidden by incorrect tags.master
rodzic
e59116fe01
commit
cb267ee695
|
@ -95,7 +95,6 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
# TODO: run other test classes
|
# TODO: run other test classes
|
||||||
mvn test -Ds3proxy.test.conf=s3proxy-azurite.conf -Dtest=AwsSdkTest
|
mvn test -Ds3proxy.test.conf=s3proxy-azurite.conf -Dtest=AwsSdkTest
|
||||||
# TODO: kill $(pidof node)
|
|
||||||
|
|
||||||
- name: Install Minio
|
- name: Install Minio
|
||||||
run: |
|
run: |
|
||||||
|
@ -104,7 +103,6 @@ jobs:
|
||||||
- name: Start Minio
|
- name: Start Minio
|
||||||
run: |
|
run: |
|
||||||
mkdir mnt/
|
mkdir mnt/
|
||||||
# TODO: kill this afterwards
|
|
||||||
MINIO_SERVER_URL=http://127.0.0.1:9000 MINIO_ROOT_USER=remote-identity MINIO_ROOT_PASSWORD=remote-credential ./minio server mnt/ &
|
MINIO_SERVER_URL=http://127.0.0.1:9000 MINIO_ROOT_USER=remote-identity MINIO_ROOT_PASSWORD=remote-credential ./minio server mnt/ &
|
||||||
- name: Maven Test with Minio
|
- name: Maven Test with Minio
|
||||||
run: |
|
run: |
|
||||||
|
@ -125,6 +123,7 @@ jobs:
|
||||||
- name: Run s3-tests with Azurite
|
- name: Run s3-tests with Azurite
|
||||||
run: |
|
run: |
|
||||||
./src/test/resources/run-s3-tests.sh s3proxy-azurite.conf
|
./src/test/resources/run-s3-tests.sh s3proxy-azurite.conf
|
||||||
|
kill $(pidof node)
|
||||||
|
|
||||||
#Store the target
|
#Store the target
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
|
|
|
@ -419,7 +419,7 @@ public abstract class AbstractNio2BlobStore extends BaseBlobStore {
|
||||||
long offset = 0;
|
long offset = 0;
|
||||||
long last = size;
|
long last = size;
|
||||||
if (range.startsWith("-")) {
|
if (range.startsWith("-")) {
|
||||||
offset = last - Long.parseLong(range.substring(1)) + 1;
|
offset = last - Long.parseLong(range.substring(1));
|
||||||
if (offset < 0) {
|
if (offset < 0) {
|
||||||
offset = 0;
|
offset = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,8 +38,6 @@ tags='not fails_on_s3proxy'\
|
||||||
' and not copy'\
|
' and not copy'\
|
||||||
' and not cors'\
|
' and not cors'\
|
||||||
' and not encryption'\
|
' and not encryption'\
|
||||||
' and not fails_on_s3proxy_azureblob'\
|
|
||||||
' and not fails_on_s3proxy_nio2'\
|
|
||||||
' and not fails_strict_rfc2616'\
|
' and not fails_strict_rfc2616'\
|
||||||
' and not iam_tenant'\
|
' and not iam_tenant'\
|
||||||
' and not lifecycle'\
|
' and not lifecycle'\
|
||||||
|
@ -56,7 +54,10 @@ tags='not fails_on_s3proxy'\
|
||||||
' and not webidentity_test'
|
' and not webidentity_test'
|
||||||
|
|
||||||
if [ "${S3PROXY_CONF}" = "s3proxy-azurite.conf" ]; then
|
if [ "${S3PROXY_CONF}" = "s3proxy-azurite.conf" ]; then
|
||||||
|
tags="${tags} and not fails_on_s3proxy_azureblob"
|
||||||
tags="${tags} and not multipart"
|
tags="${tags} and not multipart"
|
||||||
|
elif [ "${S3PROXY_CONF}" = "s3proxy-transient-nio2.conf" ]; then
|
||||||
|
tags="${tags} and not fails_on_s3proxy_nio2"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# execute s3-tests
|
# execute s3-tests
|
||||||
|
|
Ładowanie…
Reference in New Issue