Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up tags in s3-tests #745

Merged
merged 1 commit into from
Dec 25, 2024
+5 −5
Merged

Clean up tags in s3-tests #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/ci-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ jobs:
run: |
# TODO: run other test classes
mvn test -Ds3proxy.test.conf=s3proxy-azurite.conf -Dtest=AwsSdkTest
# TODO: kill $(pidof node)

- name: Install Minio
run: |
Expand All @@ -104,7 +103,6 @@ jobs:
- name: Start Minio
run: |
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/ &
- name: Maven Test with Minio
run: |
Expand All @@ -125,6 +123,7 @@ jobs:
- name: Run s3-tests with Azurite
run: |
./src/test/resources/run-s3-tests.sh s3proxy-azurite.conf
kill $(pidof node)

#Store the target
- uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gaul/s3proxy/nio2blob/AbstractNio2BlobStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ public final Blob getBlob(String container, String key, GetOptions options) {
long offset = 0;
long last = size;
if (range.startsWith("-")) {
offset = last - Long.parseLong(range.substring(1)) + 1;
offset = last - Long.parseLong(range.substring(1));
if (offset < 0) {
offset = 0;
}
Expand Down
5 changes: 3 additions & 2 deletions src/test/resources/run-s3-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ tags='not fails_on_s3proxy'\
' and not copy'\
' and not cors'\
' and not encryption'\
' and not fails_on_s3proxy_azureblob'\
' and not fails_on_s3proxy_nio2'\
' and not fails_strict_rfc2616'\
' and not iam_tenant'\
' and not lifecycle'\
Expand All @@ -56,7 +54,10 @@ tags='not fails_on_s3proxy'\
' and not webidentity_test'

if [ "${S3PROXY_CONF}" = "s3proxy-azurite.conf" ]; then
tags="${tags} and not fails_on_s3proxy_azureblob"
tags="${tags} and not multipart"
elif [ "${S3PROXY_CONF}" = "s3proxy-transient-nio2.conf" ]; then
tags="${tags} and not fails_on_s3proxy_nio2"
fi

# execute s3-tests
Expand Down
Loading