Add and improve tests #92
Merged
+43
−19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abetomo
force-pushed
the
add-and-improve-tests
branch
from
61c598e
to
f411e79
Compare
* Execute queries with commands in the container
* Remove `-p 33061:3306` from `container run`
* Change the query result to check as it is
* Add test for `mroonga_command('status')`
CI may take longer than 10 seconds.
abetomo
force-pushed
the
add-and-improve-tests
branch
from
f411e79
to
8c1c9f2
Compare
kou
reviewed
Nov 15, 2024
test.sh
Outdated
| @@ -19,29 +19,54 @@ container_name="mroonga_build_test_${timestamp}" | |||
| eval $(grep -E -o '[a-z]+_version=[0-9.]+' $context/Dockerfile) | |||
| mysql_version=$(head -n1 $context/Dockerfile | grep -E -o '[0-9.]{2,}') | |||
|
|
|||
| function run_sql() { | |||
| sql=$1 | |||
test.sh
Outdated
| success=$? | ||
|
|
||
| set -e | ||
| sudo docker container stop $container_name |
There was a problem hiding this comment.
こいつらをtrap EXITでやるようにしたら↑の&&はなくせる？
function cleanup() {
sudo docker container stop $container_name
sudo docker container logs $container_name
sudo docker container rm $container_name
}
trap cleanup EXITThere was a problem hiding this comment.
ぉぉ、これ探してたんですよ！試してみます。
test.sh
Outdated
| set +e | ||
| diff -u /tmp/expected.txt /tmp/actual.txt | ||
| echo -e "$(run_sql "SELECT JSON_PRETTY(mroonga_command('status'))")" && \ |
There was a problem hiding this comment.
echo -eってなんで必要なの？\nを改行にしたいとか？
Suggested change
| echo -e "$(run_sql "SELECT JSON_PRETTY(mroonga_command('status'))")" && \ | |
| run_sql "SELECT JSON_PRETTY(mroonga_command('status'))" && \ |
There was a problem hiding this comment.
そうですね。
echo しないと {\n "os": "Linux",\n "cpu": "x86_64",\n ... という感じだったので付けました。
そもそもこの表示がいらないか。
test.sh
Outdated
Comment on lines
28
to
29
| expected=$1 | ||
| actual=$2 |
There was a problem hiding this comment.
Suggested change
| expected=$1 | |
| actual=$2 | |
| expected="$1" | |
| actual="$2" |
test.sh
Outdated
| function assert() { | ||
| expected=$1 | ||
| actual=$2 | ||
| if [ "$(echo ${expected})" = "$(echo ${actual})" ]; then |
There was a problem hiding this comment.
なんでechoいるの？
Suggested change
| if [ "$(echo ${expected})" = "$(echo ${actual})" ]; then | |
| if [ "${expected}" = "${actual}" ]; then |
There was a problem hiding this comment.
echo いらないです。見た目が同じ文字列が = 判定されなくて色々検証していた残骸です…。
（= 判定されなかったのは \t じゃなくて （ただのスペース）だったからでした。）
kou
reviewed
Nov 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
-p 33061:3306fromcontainer runmroonga_command('status')