From 3d019098929fddd4fdd9020659df09675589e3c2 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 14:21:05 +0100 Subject: [PATCH 01/35] add the submodule --- .gitmodules | 3 +++ tests/restheart | 1 + 2 files changed, 4 insertions(+) create mode 160000 tests/restheart diff --git a/.gitmodules b/.gitmodules index 6dd98448e..2271cb15d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,3 +26,6 @@ path = tests/python-example url = https://github.com/FerretDB/python-example.git branch = main +[submodule "tests/restheart"] + path = tests/restheart + url = https://github.com/SoftInstigate/restheart.git diff --git a/tests/restheart b/tests/restheart new file mode 160000 index 000000000..e71897e42 --- /dev/null +++ b/tests/restheart @@ -0,0 +1 @@ +Subproject commit e71897e42999cae70894f6fcaa17b47fe10235d1 From 1a8112518208354150b3abf0ba1331d9f9eb1f97 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 14:21:48 +0100 Subject: [PATCH 02/35] fix submodule name --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2271cb15d..9338c6c6f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,6 +26,6 @@ path = tests/python-example url = https://github.com/FerretDB/python-example.git branch = main -[submodule "tests/restheart"] +[submodule "restheart"] path = tests/restheart url = https://github.com/SoftInstigate/restheart.git From d51e419c17d6b1bf59338127ea928547db4f8f02 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 14:41:35 +0100 Subject: [PATCH 03/35] add files --- tests/restheart.sh | 7 +++++++ tests/restheart.yml | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100755 tests/restheart.sh create mode 100644 tests/restheart.yml diff --git a/tests/restheart.sh b/tests/restheart.sh new file mode 100755 index 000000000..2b1404e84 --- /dev/null +++ b/tests/restheart.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +set -ex + +./mvnw clean verify -DskipUTs -P-mongodb \ +-Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ +-Dkarate.options="--tags ~@requires-replica-set" diff --git a/tests/restheart.yml b/tests/restheart.yml new file mode 100644 index 000000000..6dc1c6f81 --- /dev/null +++ b/tests/restheart.yml @@ -0,0 +1,17 @@ +--- +runner: command +dir: restheart +args: [../restheart.sh] + +results: + postgresql: + stats: + pass: 1 + + sqlite: + stats: + pass: 1 + + mongodb: + stats: + pass: 1 From d92c1262be9c0b2c16a3c673ae4098dd1564633b Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 14:42:23 +0100 Subject: [PATCH 04/35] add to CI --- .github/workflows/dance.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dance.yml b/.github/workflows/dance.yml index ba4086b10..5a1a72f47 100644 --- a/.github/workflows/dance.yml +++ b/.github/workflows/dance.yml @@ -60,6 +60,7 @@ jobs: - python-example-auth - ycsb-workloada - ycsb-workloadc + - restheart steps: - name: Checkout code From 18b4903364532e704b05fdd51030b80dac08754d Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 14:44:12 +0100 Subject: [PATCH 05/35] fail --- tests/restheart.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/restheart.yml b/tests/restheart.yml index 6dc1c6f81..5f26be17c 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -14,4 +14,7 @@ results: mongodb: stats: - pass: 1 + # PLAIN is used in MongoDB to perform LDAP authentication. + fail: 1 + fail: + - restheart From 49042c15449020e30caf83c8f75392232dbe25f9 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 14:51:20 +0100 Subject: [PATCH 06/35] set JAVA_HOME --- tests/restheart.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/restheart.sh b/tests/restheart.sh index 2b1404e84..2ddcc84e7 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -2,6 +2,9 @@ set -ex +# ensure we set JAVA_HOME to use Java 17 +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") + ./mvnw clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ -Dkarate.options="--tags ~@requires-replica-set" From d5d0dcb34a980f5773bb28ae1b63813b0275c2be Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 14:58:33 +0100 Subject: [PATCH 07/35] build project --- tests/restheart.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/restheart.sh b/tests/restheart.sh index 2ddcc84e7..6ce235cd9 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -5,6 +5,8 @@ set -ex # ensure we set JAVA_HOME to use Java 17 export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +./mvnw clean package + ./mvnw clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ -Dkarate.options="--tags ~@requires-replica-set" From 4c109dd101ca51320f6556075711df23ad52f55c Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 15:06:03 +0100 Subject: [PATCH 08/35] setup-java on Actions --- .github/workflows/dance.yml | 5 +++++ tests/restheart.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dance.yml b/.github/workflows/dance.yml index 5a1a72f47..7509dfd88 100644 --- a/.github/workflows/dance.yml +++ b/.github/workflows/dance.yml @@ -73,6 +73,11 @@ jobs: with: cache-key: dance + - name: Setup Java + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Install Task run: go generate -x working-directory: tools diff --git a/tests/restheart.sh b/tests/restheart.sh index 6ce235cd9..0b40149bf 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -5,7 +5,7 @@ set -ex # ensure we set JAVA_HOME to use Java 17 export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") -./mvnw clean package +# ./mvnw clean package ./mvnw clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ From 6fd8b075c760afda292b07e033713561a2d61c82 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 15:18:54 +0100 Subject: [PATCH 09/35] build --- tests/restheart.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/restheart.sh b/tests/restheart.sh index 0b40149bf..6ce235cd9 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -5,7 +5,7 @@ set -ex # ensure we set JAVA_HOME to use Java 17 export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") -# ./mvnw clean package +./mvnw clean package ./mvnw clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ From 4fc7d6f72914bdbcff37660fc35753a23ae565d1 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 15:20:29 +0100 Subject: [PATCH 10/35] fix workflow --- .github/workflows/dance.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dance.yml b/.github/workflows/dance.yml index 7509dfd88..451197202 100644 --- a/.github/workflows/dance.yml +++ b/.github/workflows/dance.yml @@ -73,10 +73,10 @@ jobs: with: cache-key: dance - - name: Setup Java - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: - java-version: 17 + distribution: 'temurin' + java-version: '17' - name: Install Task run: go generate -x From 67ca79250ad50ab6a9ed2cee44027b3d5ee70f9a Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 15:28:25 +0100 Subject: [PATCH 11/35] debug maven --- tests/restheart.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/restheart.sh b/tests/restheart.sh index 6ce235cd9..72f49cd3e 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -5,8 +5,6 @@ set -ex # ensure we set JAVA_HOME to use Java 17 export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") -./mvnw clean package - -./mvnw clean verify -DskipUTs -P-mongodb \ +./mvnw -X clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ -Dkarate.options="--tags ~@requires-replica-set" From e281673bfa1f3585ac574975fdce7e62bd34f526 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 15:34:12 +0100 Subject: [PATCH 12/35] try openjdk --- .github/workflows/dance.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dance.yml b/.github/workflows/dance.yml index 451197202..623ea49aa 100644 --- a/.github/workflows/dance.yml +++ b/.github/workflows/dance.yml @@ -73,9 +73,11 @@ jobs: with: cache-key: dance + + - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: '17' - name: Install Task From f4478937b49fc38eb83a6671100909960b9bc8da Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 15:37:53 +0100 Subject: [PATCH 13/35] remove actions/checkout --- .github/workflows/dance.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/dance.yml b/.github/workflows/dance.yml index 623ea49aa..df7333fc6 100644 --- a/.github/workflows/dance.yml +++ b/.github/workflows/dance.yml @@ -73,8 +73,6 @@ jobs: with: cache-key: dance - - - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: 'zulu' From 5891b7b93ffefb07f3e9686b0c9021caffd8dad2 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 15:38:15 +0100 Subject: [PATCH 14/35] rely on actions not JAVA_HOME --- tests/restheart.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/restheart.sh b/tests/restheart.sh index 72f49cd3e..f8c442b4a 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -3,7 +3,7 @@ set -ex # ensure we set JAVA_HOME to use Java 17 -export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +# export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") ./mvnw -X clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ From e4ed7dc3bb8dc29409e272c80c02aac9a3689c55 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 15:57:56 +0100 Subject: [PATCH 15/35] try 17 --- tests/restheart.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/restheart.sh b/tests/restheart.sh index f8c442b4a..10ba70c41 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -3,8 +3,8 @@ set -ex # ensure we set JAVA_HOME to use Java 17 -# export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") -./mvnw -X clean verify -DskipUTs -P-mongodb \ +JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") ./mvnw -X clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ -Dkarate.options="--tags ~@requires-replica-set" From 0903205de49751350812fcc5090fcf1414a86810 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 16:40:41 +0100 Subject: [PATCH 16/35] try random things --- tests/restheart.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/restheart.sh b/tests/restheart.sh index 10ba70c41..e78bc5fa2 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -3,8 +3,10 @@ set -ex # ensure we set JAVA_HOME to use Java 17 -export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +# export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") -JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") ./mvnw -X clean verify -DskipUTs -P-mongodb \ +unset $JAVA_HOME + +./mvnw -X clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ -Dkarate.options="--tags ~@requires-replica-set" From f0b0e4d8bebcb30974e793d011e8e8998913bab6 Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 16:41:38 +0100 Subject: [PATCH 17/35] unset --- tests/restheart.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/restheart.sh b/tests/restheart.sh index e78bc5fa2..39cddceab 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -5,7 +5,7 @@ set -ex # ensure we set JAVA_HOME to use Java 17 # export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") -unset $JAVA_HOME +unset JAVA_HOME ./mvnw -X clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ From 1e47044ff3f790ffc0f1ba37bc8ceabd8cf0749f Mon Sep 17 00:00:00 2001 From: b1ron Date: Mon, 6 Nov 2023 17:25:22 +0100 Subject: [PATCH 18/35] clean file --- tests/restheart.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/restheart.sh b/tests/restheart.sh index 39cddceab..ad9e70fc8 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -2,9 +2,6 @@ set -ex -# ensure we set JAVA_HOME to use Java 17 -# export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") - unset JAVA_HOME ./mvnw -X clean verify -DskipUTs -P-mongodb \ From 8d9eb75b514eee2b0afec9b05e46e6b990524fa8 Mon Sep 17 00:00:00 2001 From: b1ron Date: Tue, 7 Nov 2023 14:06:24 +0100 Subject: [PATCH 19/35] all fail --- tests/restheart.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/restheart.yml b/tests/restheart.yml index 5f26be17c..0190598e0 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -6,11 +6,15 @@ args: [../restheart.sh] results: postgresql: stats: - pass: 1 + fail: 1 + fail: + - restheart sqlite: stats: - pass: 1 + fail: 1 + fail: + - restheart mongodb: stats: From 49bb1a753de601c68a922f010d898841aa106836 Mon Sep 17 00:00:00 2001 From: b1ron Date: Tue, 7 Nov 2023 14:23:37 +0100 Subject: [PATCH 20/35] auth --- tests/restheart-auth.sh | 9 +++++++++ tests/restheart-auth.yml | 24 ++++++++++++++++++++++++ tests/restheart.sh | 2 +- tests/restheart.yml | 2 +- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100755 tests/restheart-auth.sh create mode 100644 tests/restheart-auth.yml diff --git a/tests/restheart-auth.sh b/tests/restheart-auth.sh new file mode 100755 index 000000000..ad9e70fc8 --- /dev/null +++ b/tests/restheart-auth.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -ex + +unset JAVA_HOME + +./mvnw -X clean verify -DskipUTs -P-mongodb \ +-Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ +-Dkarate.options="--tags ~@requires-replica-set" diff --git a/tests/restheart-auth.yml b/tests/restheart-auth.yml new file mode 100644 index 000000000..0190598e0 --- /dev/null +++ b/tests/restheart-auth.yml @@ -0,0 +1,24 @@ +--- +runner: command +dir: restheart +args: [../restheart.sh] + +results: + postgresql: + stats: + fail: 1 + fail: + - restheart + + sqlite: + stats: + fail: 1 + fail: + - restheart + + mongodb: + stats: + # PLAIN is used in MongoDB to perform LDAP authentication. + fail: 1 + fail: + - restheart diff --git a/tests/restheart.sh b/tests/restheart.sh index ad9e70fc8..b412c4be6 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -5,5 +5,5 @@ set -ex unset JAVA_HOME ./mvnw -X clean verify -DskipUTs -P-mongodb \ --Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ +-Dtest-connection-string="mongodb://localhost/ferretdb" \ -Dkarate.options="--tags ~@requires-replica-set" diff --git a/tests/restheart.yml b/tests/restheart.yml index 0190598e0..fb1b23f37 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -18,7 +18,7 @@ results: mongodb: stats: - # PLAIN is used in MongoDB to perform LDAP authentication. + # ETagIT.createTestData:65 create db test-etag-db ==> expected: <201> but was: <200> fail: 1 fail: - restheart From 457b472ee81b84c95c75aa4db273bc11646bb94f Mon Sep 17 00:00:00 2001 From: b1ron Date: Tue, 7 Nov 2023 14:23:51 +0100 Subject: [PATCH 21/35] add to CI --- .github/workflows/dance.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dance.yml b/.github/workflows/dance.yml index df7333fc6..618db2077 100644 --- a/.github/workflows/dance.yml +++ b/.github/workflows/dance.yml @@ -61,6 +61,7 @@ jobs: - ycsb-workloada - ycsb-workloadc - restheart + - restheart-auth steps: - name: Checkout code From f058aea8c4844575c25d2908d11d18c52fda688d Mon Sep 17 00:00:00 2001 From: b1ron Date: Tue, 7 Nov 2023 15:07:59 +0100 Subject: [PATCH 22/35] fix --- tests/restheart-auth.sh | 2 ++ tests/restheart.sh | 2 ++ tests/restheart.yml | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/restheart-auth.sh b/tests/restheart-auth.sh index ad9e70fc8..19335f99d 100755 --- a/tests/restheart-auth.sh +++ b/tests/restheart-auth.sh @@ -4,6 +4,8 @@ set -ex unset JAVA_HOME +./mvnw clean package + ./mvnw -X clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ -Dkarate.options="--tags ~@requires-replica-set" diff --git a/tests/restheart.sh b/tests/restheart.sh index b412c4be6..aa324e676 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -4,6 +4,8 @@ set -ex unset JAVA_HOME +./mvnw clean package + ./mvnw -X clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://localhost/ferretdb" \ -Dkarate.options="--tags ~@requires-replica-set" diff --git a/tests/restheart.yml b/tests/restheart.yml index fb1b23f37..bae26af23 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -18,7 +18,6 @@ results: mongodb: stats: - # ETagIT.createTestData:65 create db test-etag-db ==> expected: <201> but was: <200> fail: 1 fail: - restheart From 58a0c38d236022db0d74ca1f78c931e30fe94088 Mon Sep 17 00:00:00 2001 From: b1ron Date: Wed, 8 Nov 2023 09:54:53 +0100 Subject: [PATCH 23/35] add branch --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 9338c6c6f..9a75fcf4b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,3 +29,4 @@ [submodule "restheart"] path = tests/restheart url = https://github.com/SoftInstigate/restheart.git + branch = master From 4cbc9f71f9ca586601c02dfdc79b21dc059e0e41 Mon Sep 17 00:00:00 2001 From: b1ron Date: Wed, 8 Nov 2023 09:55:28 +0100 Subject: [PATCH 24/35] add link --- tests/restheart-auth.yml | 2 ++ tests/restheart.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/restheart-auth.yml b/tests/restheart-auth.yml index 0190598e0..ae8b73747 100644 --- a/tests/restheart-auth.yml +++ b/tests/restheart-auth.yml @@ -8,12 +8,14 @@ results: stats: fail: 1 fail: + # https://github.com/FerretDB/FerretDB/issues/2568 - restheart sqlite: stats: fail: 1 fail: + # https://github.com/FerretDB/FerretDB/issues/2568 - restheart mongodb: diff --git a/tests/restheart.yml b/tests/restheart.yml index bae26af23..9d276d576 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -8,12 +8,14 @@ results: stats: fail: 1 fail: + # https://github.com/FerretDB/FerretDB/issues/2568 - restheart sqlite: stats: fail: 1 fail: + # https://github.com/FerretDB/FerretDB/issues/2568 - restheart mongodb: From 4f9493a07b8b70be4f1d40c086d197fbb15d70f1 Mon Sep 17 00:00:00 2001 From: b1ron Date: Wed, 8 Nov 2023 10:00:57 +0100 Subject: [PATCH 25/35] move link up --- tests/restheart-auth.yml | 4 ++-- tests/restheart.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/restheart-auth.yml b/tests/restheart-auth.yml index ae8b73747..2051e066e 100644 --- a/tests/restheart-auth.yml +++ b/tests/restheart-auth.yml @@ -6,16 +6,16 @@ args: [../restheart.sh] results: postgresql: stats: + # https://github.com/FerretDB/FerretDB/issues/2568 fail: 1 fail: - # https://github.com/FerretDB/FerretDB/issues/2568 - restheart sqlite: stats: + # https://github.com/FerretDB/FerretDB/issues/2568 fail: 1 fail: - # https://github.com/FerretDB/FerretDB/issues/2568 - restheart mongodb: diff --git a/tests/restheart.yml b/tests/restheart.yml index 9d276d576..d8e159053 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -6,16 +6,16 @@ args: [../restheart.sh] results: postgresql: stats: + # https://github.com/FerretDB/FerretDB/issues/2568 fail: 1 fail: - # https://github.com/FerretDB/FerretDB/issues/2568 - restheart sqlite: stats: + # https://github.com/FerretDB/FerretDB/issues/2568 fail: 1 fail: - # https://github.com/FerretDB/FerretDB/issues/2568 - restheart mongodb: From e19161dd523ff7c54a46b21d1cefba3db4f750f3 Mon Sep 17 00:00:00 2001 From: b1ron Date: Thu, 9 Nov 2023 06:32:07 +0100 Subject: [PATCH 26/35] remove debug flag and mongo passes now --- tests/restheart-auth.sh | 2 +- tests/restheart.sh | 2 +- tests/restheart.yml | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/restheart-auth.sh b/tests/restheart-auth.sh index 19335f99d..9410ef43e 100755 --- a/tests/restheart-auth.sh +++ b/tests/restheart-auth.sh @@ -6,6 +6,6 @@ unset JAVA_HOME ./mvnw clean package -./mvnw -X clean verify -DskipUTs -P-mongodb \ +./mvnw clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://user:password@localhost/ferretdb?authMechanism=PLAIN" \ -Dkarate.options="--tags ~@requires-replica-set" diff --git a/tests/restheart.sh b/tests/restheart.sh index aa324e676..f48e2a854 100755 --- a/tests/restheart.sh +++ b/tests/restheart.sh @@ -6,6 +6,6 @@ unset JAVA_HOME ./mvnw clean package -./mvnw -X clean verify -DskipUTs -P-mongodb \ +./mvnw clean verify -DskipUTs -P-mongodb \ -Dtest-connection-string="mongodb://localhost/ferretdb" \ -Dkarate.options="--tags ~@requires-replica-set" diff --git a/tests/restheart.yml b/tests/restheart.yml index d8e159053..aa8cd2e73 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -20,6 +20,4 @@ results: mongodb: stats: - fail: 1 - fail: - - restheart + pass: 1 From e5064d6f116c9aca769c74879dba374243e92f02 Mon Sep 17 00:00:00 2001 From: b1ron Date: Thu, 9 Nov 2023 06:34:16 +0100 Subject: [PATCH 27/35] sort tests --- .github/workflows/dance.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dance.yml b/.github/workflows/dance.yml index 618db2077..9c2dd28ba 100644 --- a/.github/workflows/dance.yml +++ b/.github/workflows/dance.yml @@ -58,10 +58,10 @@ jobs: - mongo-tools - python-example - python-example-auth - - ycsb-workloada - - ycsb-workloadc - restheart - restheart-auth + - ycsb-workloada + - ycsb-workloadc steps: - name: Checkout code From fe685a1f7f6ef2c20653469496515c0566be8c57 Mon Sep 17 00:00:00 2001 From: b1ron Date: Thu, 9 Nov 2023 09:09:13 +0100 Subject: [PATCH 28/35] add comment --- tests/restheart.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/restheart.yml b/tests/restheart.yml index aa8cd2e73..f4db05b76 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -20,4 +20,7 @@ results: mongodb: stats: - pass: 1 + # fails because it requires replication + fail: 1 + fail: + - restheart From 01c0a412650c5565203ffc668c26d1b60bd618b0 Mon Sep 17 00:00:00 2001 From: b1ron Date: Tue, 21 Nov 2023 10:55:10 +0100 Subject: [PATCH 29/35] add link --- tests/restheart.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/restheart.yml b/tests/restheart.yml index f4db05b76..46715a99b 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -20,7 +20,7 @@ results: mongodb: stats: - # fails because it requires replication + # https://github.com/FerretDB/dance/issues/651 fail: 1 fail: - restheart From 1a4b5dafc2372c5695c70de52512a9ff1ea20dba Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Wed, 22 Nov 2023 14:02:12 +0400 Subject: [PATCH 30/35] Add name --- .github/workflows/dance.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dance.yml b/.github/workflows/dance.yml index 9c2dd28ba..13e2650d4 100644 --- a/.github/workflows/dance.yml +++ b/.github/workflows/dance.yml @@ -74,7 +74,8 @@ jobs: with: cache-key: dance - - uses: actions/setup-java@v3 + - name: Install Java + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '17' From 6b87c08f4a5cba966c0d386458e5c076c51d5e6e Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Wed, 22 Nov 2023 14:02:21 +0400 Subject: [PATCH 31/35] Update comment --- internal/gotest/gotest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/gotest/gotest.go b/internal/gotest/gotest.go index 442d22b79..43c717935 100644 --- a/internal/gotest/gotest.go +++ b/internal/gotest/gotest.go @@ -31,7 +31,7 @@ import ( // Run runs `go test`. // Args contain additional arguments to `go test`. -// `-v -json -count=1` are always added. +// `-v -json -p=1 -count=1` are always added. // `-race` is added if possible. func Run(ctx context.Context, dir string, args []string, verbose bool, parallel int) (*config.TestResults, error) { // TODO https://github.com/FerretDB/dance/issues/20 From 877165133cd99dfebacc20573b1bc3480aa5ec38 Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Wed, 22 Nov 2023 14:02:30 +0400 Subject: [PATCH 32/35] Update submodules --- tests/dotnet-example | 2 +- tests/java-example | 2 +- tests/python-example | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/dotnet-example b/tests/dotnet-example index eae75ec7d..3af4abc19 160000 --- a/tests/dotnet-example +++ b/tests/dotnet-example @@ -1 +1 @@ -Subproject commit eae75ec7d250121085f553511ad63b1b5272a959 +Subproject commit 3af4abc193ba8033d10e99dcb2e98d31d45082db diff --git a/tests/java-example b/tests/java-example index 14a406ce4..9ff08cdc1 160000 --- a/tests/java-example +++ b/tests/java-example @@ -1 +1 @@ -Subproject commit 14a406ce4a3e92c835e15ec3a3971b7e4053a5a4 +Subproject commit 9ff08cdc1545b27352ed929c39e55ddd5ee5b1a8 diff --git a/tests/python-example b/tests/python-example index de1615e36..9c3899ead 160000 --- a/tests/python-example +++ b/tests/python-example @@ -1 +1 @@ -Subproject commit de1615e366d0ab6c55d8c125958fc3c83028d0e2 +Subproject commit 9c3899eadd4638e783d5b4cbfa40ccadb8f9091e From 95ed9e8901ceaf22805f61f9baa40a563e589104 Mon Sep 17 00:00:00 2001 From: b1ron Date: Thu, 23 Nov 2023 02:09:33 +0100 Subject: [PATCH 33/35] remove link and fix stats --- tests/restheart.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/restheart.yml b/tests/restheart.yml index 46715a99b..aa8cd2e73 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -20,7 +20,4 @@ results: mongodb: stats: - # https://github.com/FerretDB/dance/issues/651 - fail: 1 - fail: - - restheart + pass: 1 From cefe9d49d9c897029809819260cdb030658c98e1 Mon Sep 17 00:00:00 2001 From: b1ron Date: Thu, 23 Nov 2023 02:12:49 +0100 Subject: [PATCH 34/35] remove link but still fails --- tests/restheart.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/restheart.yml b/tests/restheart.yml index aa8cd2e73..d8e159053 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -20,4 +20,6 @@ results: mongodb: stats: - pass: 1 + fail: 1 + fail: + - restheart From b7a4c93c2f8fedb73f78bdb740258ad6ac5ff501 Mon Sep 17 00:00:00 2001 From: b1ron Date: Thu, 23 Nov 2023 08:59:52 +0100 Subject: [PATCH 35/35] add link to comment --- tests/restheart.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/restheart.yml b/tests/restheart.yml index d8e159053..1b7c8defa 100644 --- a/tests/restheart.yml +++ b/tests/restheart.yml @@ -20,6 +20,7 @@ results: mongodb: stats: + # https://github.com/SoftInstigate/restheart/issues/477#issuecomment-1823937412 fail: 1 fail: - restheart