Skip to content

fix(db test): resolve absolute paths before computing relative path #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

Open
7ttp wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(db test): resolve absolute paths before computing relative path #4590

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions internal/db/test/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,16 @@ const (
func Run(ctx context.Context, testFiles []string, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
// Build test command
cmd := []string{"pg_prove", "--ext", ".pg", "--ext", ".sql", "-r"}
absTestsDir, err := filepath.Abs(utils.DbTestsDir)
if err != nil {
return errors.Errorf("failed to resolve absolute path: %w", err)
}
for _, fp := range testFiles {
relPath, err := filepath.Rel(utils.DbTestsDir, fp)
absPath, err := filepath.Abs(fp)
if err != nil {
return errors.Errorf("failed to resolve absolute path: %w", err)
}
relPath, err := filepath.Rel(absTestsDir, absPath)
if err != nil {
return errors.Errorf("failed to resolve relative path: %w", err)
}
Expand All @@ -38,10 +46,7 @@ func Run(ctx context.Context, testFiles []string, config pgconn.Config, fsys afe
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)
}
srcPath := absTestsDir
dstPath := "/tmp"
binds := []string{fmt.Sprintf("%s:%s:ro", srcPath, dstPath)}
// Enable pgTAP if not already exists
Expand Down
Loading