Add error info in message 'unable to init db' (fergusstrange#77)

dor-utila · web-flow · commit f9d296fcdef6 · 2022-08-09T10:27:04.000+10:00
* Add error info in message 'unable to init db'
diff --git a/prepare_database.go b/prepare_database.go
@@ -44,12 +44,12 @@ func defaultInitDatabase(binaryExtractLocation, runtimePath, pgDataDir, username
 	postgresInitDBProcess.Stderr = logger
 	postgresInitDBProcess.Stdout = logger
 
-	if err := postgresInitDBProcess.Run(); err != nil {
-		return fmt.Errorf("unable to init database using: %s", postgresInitDBProcess.String())
+	if err = postgresInitDBProcess.Run(); err != nil {
+		return fmt.Errorf("unable to init database using '%s': %w", postgresInitDBProcess.String(), err)
 	}
 
 	if err = os.Remove(passwordFile); err != nil {
-		return fmt.Errorf("unable to remove password file '%v': %v", passwordFile, err)
+		return fmt.Errorf("unable to remove password file '%v': %w", passwordFile, err)
 	}
 
 	return nil
diff --git a/prepare_database_test.go b/prepare_database_test.go
@@ -40,7 +40,8 @@ func Test_defaultInitDatabase_ErrorWhenCannotStartInitDBProcess(t *testing.T) {
 
 	err = defaultInitDatabase(binTempDir, runtimeTempDir, filepath.Join(runtimeTempDir, "data"), "Tom", "Beer", "", os.Stderr)
 
-	assert.EqualError(t, err, fmt.Sprintf("unable to init database using: %s/bin/initdb -A password -U Tom -D %s/data --pwfile=%s/pwfile",
+	assert.NotNil(t, err)
+	assert.Contains(t, err.Error(), fmt.Sprintf("unable to init database using '%s/bin/initdb -A password -U Tom -D %s/data --pwfile=%s/pwfile'",
 		binTempDir,
 		runtimeTempDir,
 		runtimeTempDir))
@@ -61,7 +62,8 @@ func Test_defaultInitDatabase_ErrorInvalidLocaleSetting(t *testing.T) {
 
 	err = defaultInitDatabase(tempDir, tempDir, filepath.Join(tempDir, "data"), "postgres", "postgres", "en_XY", os.Stderr)
 
-	assert.EqualError(t, err, fmt.Sprintf("unable to init database using: %s/bin/initdb -A password -U postgres -D %s/data --pwfile=%s/pwfile --locale=en_XY",
+	assert.NotNil(t, err)
+	assert.Contains(t, err.Error(), fmt.Sprintf("unable to init database using '%s/bin/initdb -A password -U postgres -D %s/data --pwfile=%s/pwfile --locale=en_XY'",
 		tempDir,
 		tempDir,
 		tempDir))

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ func defaultInitDatabase(binaryExtractLocation, runtimePath, pgDataDir, username`
`44`	`44`	`postgresInitDBProcess.Stderr = logger`
`45`	`45`	`postgresInitDBProcess.Stdout = logger`
`46`	`46`
`47`		`- if err := postgresInitDBProcess.Run(); err != nil {`
`48`		`- return fmt.Errorf("unable to init database using: %s", postgresInitDBProcess.String())`
	`47`	`+ if err = postgresInitDBProcess.Run(); err != nil {`
	`48`	`+ return fmt.Errorf("unable to init database using '%s': %w", postgresInitDBProcess.String(), err)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`if err = os.Remove(passwordFile); err != nil {`
`52`		`- return fmt.Errorf("unable to remove password file '%v': %v", passwordFile, err)`
	`52`	`+ return fmt.Errorf("unable to remove password file '%v': %w", passwordFile, err)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`return nil`