dockertestの導入 #691
Merged
dockertestの導入 #691
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
Codecov ReportAll modified lines are covered by tests ✅
... and 1 file with indirect coverage changes 📢 Thoughts on this report? Let us know!. |
mazrean
requested changes
Sep 21, 2023
src/storage/s3/client_test.go
Outdated
| "github.com/traPtitech/trap-collection-server/src/storage" | ||
| ) | ||
|
|
||
| var testClient *Client | ||
|
|
||
| func (c *Client) createBucket() error { | ||
| fmt.Printf("bucket: %v\n", c.bucket) |
src/repository/gorm2/db_test.go
Outdated
|
|
||
| // テスト用のAppConfig | ||
| // config.Appを実装 | ||
| type testAppConfig struct{} |
There was a problem hiding this comment.
configにもmockがあるはずなので、そちらを使った方がよさそう
src/repository/gorm2/db_test.go
Outdated
|
|
||
| // テスト用のRepositoryConfig | ||
| // config.RepositoryGorm2を実装 | ||
| type testRepositoryConfig struct { |
src/storage/s3/client_test.go
Outdated
| os.Exit(code) | ||
| } | ||
|
|
||
| type testStorageS3 struct { |
src/repository/gorm2/db_test.go
Outdated
|
|
||
| pool, err := dockertest.NewPool("") | ||
| if err != nil { | ||
| log.Fatalf("Could not create pool: %s", err) |
There was a problem hiding this comment.
log.Fatalfはdeferとか無視して強制終了するので、基本的にpanicとfmt.Sprintfとかで書いた方が良いです
src/repository/gorm2/db_test.go
Outdated
| Repository: "mariadb", | ||
| Tag: "10.6.4", | ||
| Env: []string{ | ||
| "MYSQL_ROOT_PASSWORD=pass", |
There was a problem hiding this comment.
passとかのdb接続時にも使う定数はconstで定義してそれ使うように書いた方が良いかも
src/repository/gorm2/db_test.go
Outdated
| } | ||
|
|
||
| if err := pool.Retry(func() error { | ||
| testDB, err = NewDB(&testAppConfig{}, &testRepositoryConfig{resource.GetPort("3306/tcp")}) |
There was a problem hiding this comment.
GetPortのデフォルト、3306/tcpだとデフォルト値になったときstrconv.Atoiに失敗しそう？
mazrean
approved these changes
Sep 25, 2023
src/config/v1/storage.go
Outdated
Comment on lines
162
to
163
| s3UsePathStyle := os.Getenv(envKeyS3UsePathStyle) | ||
| return s3UsePathStyle == "true" |
There was a problem hiding this comment.
os.LookupEnv使った方が「デフォルトはfalse」というのが分かりやすくてよいかも。
あと、boolのstringの判定はstrconv.ParseBoolとかを使った方が綺麗に一般的にboolっぽく扱われる文字列を変換できて良さそう。
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.
resolve: #468
今までdocker compose を使ってDBやストレージのテストを行っていたが、 https://github.com/ory/dockertest/tree/v3 を使うようにした。
これによってコンテナを常時立てておかなくても手元でユニットテストを実行しやすくなった。VSCodeの「run test」ボタンとかからもテストを実行できる。