Skip to content

CI: 3.12 compatibility #542

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.

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

Merged
merged 6 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
docker-img:
- docker.io/arangodb/enterprise:3.11.6
- docker.io/arangodb/enterprise:3.11.7
topology:
- single
module:
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
run: mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
- name: Test Native
working-directory: ${{matrix.module}}
run: mvn --no-transfer-progress -Pnative -P'!arch-test' test
run: mvn --no-transfer-progress -Pnative -P'!arch-test' -DenableSlowTests=true test

test-native-ssl:
timeout-minutes: 20
Expand All @@ -52,7 +52,7 @@ jobs:
fail-fast: false
matrix:
docker-img:
- docker.io/arangodb/enterprise:3.11.6
- docker.io/arangodb/enterprise:3.11.7
topology:
- single
module:
Expand Down Expand Up @@ -81,4 +81,4 @@ jobs:
run: mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
- name: Test Native
working-directory: ${{matrix.module}}
run: mvn --no-transfer-progress -Pnative -P'!arch-test' -Dgroups=ssl -DSslTest=true test
run: mvn --no-transfer-progress -Pnative -P'!arch-test' -Dgroups=ssl -DSslTest=true -DenableSlowTests=true test
2 changes: 1 addition & 1 deletion .github/workflows/resilience.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ jobs:
run: mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
- name: Test
working-directory: resilience-tests
run: mvn --no-transfer-progress test
run: mvn --no-transfer-progress -DenableSlowTests=true test
49 changes: 26 additions & 23 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ jobs:
fail-fast: false
matrix:
docker-img:
- docker.io/arangodb/arangodb:3.10.11
- docker.io/arangodb/arangodb:3.11.6
- docker.io/arangodb/enterprise:3.10.11
- docker.io/arangodb/enterprise:3.11.6
- docker.io/arangodb/arangodb:3.10.13
- docker.io/arangodb/arangodb:3.11.7
- docker.io/arangodb/arangodb-preview:devel-nightly
- docker.io/arangodb/enterprise:3.10.13
- docker.io/arangodb/enterprise:3.11.7
- docker.io/arangodb/enterprise-preview:devel-nightly
topology:
- single
- cluster
Expand All @@ -42,6 +44,11 @@ jobs:
- 21
user-language:
- en
exclude:
- docker-img: docker.io/arangodb/arangodb-preview:devel-nightly
topology: activefailover
- docker-img: docker.io/arangodb/enterprise-preview:devel-nightly
topology: activefailover

steps:
- uses: actions/checkout@v2
Expand All @@ -57,11 +64,10 @@ jobs:
ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
STARTER_MODE: ${{matrix.topology}}
DOCKER_IMAGE: ${{matrix.docker-img}}
EXTENDED_NAMES: ${{matrix.db-ext-names}}
- name: Info
run: mvn -version
- name: Test
run: mvn --no-transfer-progress -am -pl driver test -DargLine="-Duser.language=${{matrix.user-language}}"
run: mvn --no-transfer-progress -am -pl driver test -DargLine="-Duser.language=${{matrix.user-language}}" -DenableSlowTests=true

test-ssl:
if: '! github.event.pull_request.draft'
Expand All @@ -72,7 +78,7 @@ jobs:
fail-fast: false
matrix:
docker-img:
- docker.io/arangodb/arangodb:3.11.6
- docker.io/arangodb/arangodb:3.11.7
topology:
- single
java-version:
Expand All @@ -96,7 +102,7 @@ jobs:
- name: Info
run: mvn -version
- name: Test
run: mvn --no-transfer-progress -Dgroups=ssl -DSslTest=true -am -pl driver test
run: mvn --no-transfer-progress -Dgroups=ssl -DSslTest=true -DenableSlowTests=true -am -pl driver test

# test encodeURIComponent() and normalize('NFC') comparing to Javascript behavior
test-graalvm:
Expand All @@ -113,7 +119,7 @@ jobs:
- name: Info
run: mvn -version
- name: Test
run: mvn -e --no-transfer-progress -am -pl driver test -Dtest=graalvm.UnicodeUtilsTest -Dsurefire.failIfNoSpecifiedTests=false
run: mvn -e --no-transfer-progress -am -pl driver test -Dtest=graalvm.UnicodeUtilsTest -Dsurefire.failIfNoSpecifiedTests=false -DenableSlowTests=true

test-jwt:
if: '! github.event.pull_request.draft'
Expand All @@ -124,7 +130,7 @@ jobs:
fail-fast: false
matrix:
docker-img:
- docker.io/arangodb/enterprise:3.11.6
- docker.io/arangodb/enterprise:3.11.7
topology:
- single
- cluster
Expand All @@ -150,7 +156,6 @@ jobs:
ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
STARTER_MODE: ${{matrix.topology}}
DOCKER_IMAGE: ${{matrix.docker-img}}
EXTENDED_NAMES: ${{matrix.db-ext-names}}
- name: Set JWT
run: |
ENDPOINT=$(./docker/find_active_endpoint.sh)
Expand All @@ -161,7 +166,7 @@ jobs:
- name: Info
run: mvn -version
- name: Test
run: mvn --no-transfer-progress -am -pl driver test -DargLine="-Duser.language=${{matrix.user-language}}"
run: mvn --no-transfer-progress -am -pl driver test -DargLine="-Duser.language=${{matrix.user-language}}" -DenableSlowTests=true

jackson-test:
if: '! github.event.pull_request.draft'
Expand All @@ -180,7 +185,7 @@ jobs:
- 2.11.4
- 2.10.5
docker-img:
- docker.io/arangodb/arangodb:3.11.6
- docker.io/arangodb/arangodb:3.11.7
topology:
- single
db-ext-names:
Expand All @@ -204,11 +209,10 @@ jobs:
ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
STARTER_MODE: ${{matrix.topology}}
DOCKER_IMAGE: ${{matrix.docker-img}}
EXTENDED_NAMES: ${{matrix.db-ext-names}}
- name: Info
run: mvn -version
- name: Test
run: mvn --no-transfer-progress -am -pl driver test -Dadb.jackson.version=${{matrix.jackson-version}}
run: mvn --no-transfer-progress -am -pl driver test -Dadb.jackson.version=${{matrix.jackson-version}} -DenableSlowTests=true

integration-tests:
if: '! github.event.pull_request.draft'
Expand All @@ -219,7 +223,7 @@ jobs:
fail-fast: false
matrix:
docker-img:
- docker.io/arangodb/arangodb:3.11.6
- docker.io/arangodb/arangodb:3.11.7
topology:
- single
- cluster
Expand All @@ -245,16 +249,16 @@ jobs:
run: mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
- name: Test internal-serde
working-directory: integration-tests
run: mvn --no-transfer-progress -Pinternal-serde test
run: mvn --no-transfer-progress -Pinternal-serde -DenableSlowTests=true test
- name: Test jackson-serde
working-directory: integration-tests
run: mvn --no-transfer-progress -Pjackson-serde test
run: mvn --no-transfer-progress -Pjackson-serde -DenableSlowTests=true test
- name: Test jsonb-serde
working-directory: integration-tests
run: mvn --no-transfer-progress -Pjsonb-serde test
run: mvn --no-transfer-progress -Pjsonb-serde -DenableSlowTests=true test
- name: Test plain
working-directory: integration-tests
run: mvn --no-transfer-progress -Pplain test
run: mvn --no-transfer-progress -Pplain -DenableSlowTests=true test

sonar:
if: '! github.event.pull_request.draft'
Expand All @@ -265,7 +269,7 @@ jobs:
fail-fast: false
matrix:
docker-img:
- docker.io/arangodb/enterprise:3.11.6
- docker.io/arangodb/enterprise:3.11.7
topology:
- cluster
db-ext-names:
Expand All @@ -289,7 +293,6 @@ jobs:
ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
STARTER_MODE: ${{matrix.topology}}
DOCKER_IMAGE: ${{matrix.docker-img}}
EXTENDED_NAMES: ${{matrix.db-ext-names}}
- name: Info
run: mvn -version
- name: Cache SonarCloud packages
Expand All @@ -302,4 +305,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn --no-transfer-progress -Pstatic-code-analysis -B -Dgpg.skip=true -am -pl driver verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=arangodb_arangodb-java-driver -Dmaven.javadoc.skip=true
run: mvn --no-transfer-progress -Pstatic-code-analysis -B -Dgpg.skip=true -am -pl driver verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=arangodb_arangodb-java-driver -Dmaven.javadoc.skip=true -DenableSlowTests=true
6 changes: 0 additions & 6 deletions docker/start_db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# STARTER_MODE: (single|cluster|activefailover), default single
# DOCKER_IMAGE: ArangoDB docker image, default docker.io/arangodb/arangodb:latest
# SSL: (true|false), default false
# EXTENDED_NAMES: (true|false), default false
# ARANGO_LICENSE_KEY: only required for ArangoDB Enterprise

# EXAMPLE:
Expand All @@ -13,7 +12,6 @@
STARTER_MODE=${STARTER_MODE:=single}
DOCKER_IMAGE=${DOCKER_IMAGE:=docker.io/arangodb/arangodb:latest}
SSL=${SSL:=false}
EXTENDED_NAMES=${EXTENDED_NAMES:=false}

STARTER_DOCKER_IMAGE=docker.io/arangodb/arangodb-starter:latest
GW=172.28.0.1
Expand Down Expand Up @@ -46,10 +44,6 @@ if [ "$SSL" == "true" ]; then
ARANGOSH_SCHEME=http+ssl
fi

if [ "$EXTENDED_NAMES" == "true" ]; then
STARTER_ARGS="${STARTER_ARGS} --all.database.extended-names=true"
fi

if [ "$USE_MOUNTED_DATA" == "true" ]; then
STARTER_ARGS="${STARTER_ARGS} --starter.data-dir=/data"
MOUNT_DATA="-v $LOCATION/data:/data"
Expand Down
8 changes: 8 additions & 0 deletions driver/src/test/java/CommunicationTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import com.arangodb.*;
import com.arangodb.config.ArangoConfigProperties;
import com.arangodb.util.SlowTest;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
Expand All @@ -10,13 +11,17 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

public class CommunicationTest {

@SlowTest
@ParameterizedTest
@EnumSource(Protocol.class)
@Timeout(5)
void disconnectAsync(Protocol protocol) throws InterruptedException, ExecutionException {
assumeTrue(!protocol.equals(Protocol.VST) || BaseJunit5.isLessThanVersion(3, 12));

ArangoDBAsync arangoDB = new ArangoDB.Builder()
.loadProperties(ArangoConfigProperties.fromFile())
.protocol(protocol)
Expand All @@ -36,10 +41,13 @@ void disconnectAsync(Protocol protocol) throws InterruptedException, ExecutionEx
.hasMessageContaining("closed");
}

@SlowTest
@ParameterizedTest
@EnumSource(Protocol.class)
@Timeout(5)
void disconnect(Protocol protocol) {
assumeTrue(!protocol.equals(Protocol.VST) || BaseJunit5.isLessThanVersion(3, 12));

ArangoDB arangoDB = new ArangoDB.Builder()
.loadProperties(ArangoConfigProperties.fromFile())
.protocol(protocol)
Expand Down
Loading