Skip to content

fix(db): support arbitrary test directories #4590

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

Merged
sweatybridge merged 4 commits into from
Jan 8, 2026
Merged

fix(db): support arbitrary test directories #4590

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6deb86
fix(db test): resolve absolute paths before computing relative path
7ttp Dec 6, 2025
5f6c306
fix: support arbitrary test directories
sweatybridge Jan 8, 2026
7189e9b
chore: unset container working dir
sweatybridge Jan 8, 2026
83f6d28
chore: refactor bind mount
sweatybridge Jan 8, 2026
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
25 changes: 11 additions & 14 deletions internal/db/test/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,22 @@ const (

func Run(ctx context.Context, testFiles []string, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
// Build test command
if len(testFiles) == 0 {
testFiles = append(testFiles, utils.DbTestsDir)
}
binds := make([]string, len(testFiles))
cmd := []string{"pg_prove", "--ext", ".pg", "--ext", ".sql", "-r"}
for _, fp := range testFiles {
relPath, err := filepath.Rel(utils.DbTestsDir, fp)
if err != nil {
return errors.Errorf("failed to resolve relative path: %w", err)
for i, fp := range testFiles {
if !filepath.IsAbs(fp) {
fp = filepath.Join(utils.CurrentDirAbs, fp)
}
cmd = append(cmd, relPath)
dockerPath := utils.ToDockerPath(fp)
cmd = append(cmd, dockerPath)
binds[i] = fmt.Sprintf("%s:%s:ro", fp, dockerPath)
}
if viper.GetBool("DEBUG") {
cmd = append(cmd, "--verbose")
}
// Mount tests directory into container as working directory
srcPath, err := filepath.Abs(utils.DbTestsDir)
if err != nil {
return errors.Errorf("failed to resolve absolute path: %w", err)
}
dstPath := "/tmp"
binds := []string{fmt.Sprintf("%s:%s:ro", srcPath, dstPath)}
// Enable pgTAP if not already exists
alreadyExists := false
options = append(options, func(cc *pgx.ConnConfig) {
Expand Down Expand Up @@ -87,8 +85,7 @@ func Run(ctx context.Context, testFiles []string, config pgconn.Config, fsys afe
"PGPASSWORD=" + config.Password,
"PGDATABASE=" + config.Database,
},
Cmd: cmd,
WorkingDir: dstPath,
Cmd: cmd,
},
hostConfig,
network.NetworkingConfig{},
Expand Down
Loading