Merge pull request #1751 from dolthub/jennifer/fix-test

[no-release-notes] fix show port test

Author: jennifersp

testing/go/framework.go

@@ -53,6 +53,9 @@ import (
 // rather than starting a doltgres server.
 const runOnPostgres = false
 
+// currentPort is a port number that is currently in use. It's for tests only.
+var currentPort = 5432
+
 // ScriptTest defines a consistent structure for testing queries.
 type ScriptTest struct {
 	// Name of the script.
@@ -161,6 +164,7 @@ func RunScript(t *testing.T, script ScriptTest, normalizeRows bool) {
 			controller.Stop()
 			err := controller.WaitForStop()
 			require.NoError(t, err)
+			currentPort = 5432
 		}()
 	}
 
@@ -337,6 +341,7 @@ func init() {
 func CreateServer(t *testing.T, database string) (context.Context, *Connection, *svcs.Controller) {
 	require.NotEmpty(t, database)
 	port := GetUnusedPort(t)
+	currentPort = port
 	controller, err := dserver.RunInMemory(&servercfg.DoltgresConfig{
 		ListenerConfig: &servercfg.DoltgresListenerConfig{
 			PortNumber: &port,

testing/go/set_test.go

@@ -15,6 +15,7 @@
 package _go
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/dolthub/go-mysql-server/sql"
@@ -5841,15 +5842,15 @@ var setStmts = []ScriptTest{
 		Assertions: []ScriptTestAssertion{
 			{
 				Query:    "SHOW port",
-				Expected: []sql.Row{{int64(5432)}},
+				Expected: []sql.Row{{currentPort}},
 			},
 			{
 				Query:       "SET port TO '5432'",
 				ExpectedErr: "is a read only variable",
 			},
 			{
 				Query:    "SELECT current_setting('port')",
-				Expected: []sql.Row{{"5432"}},
+				Expected: []sql.Row{{fmt.Sprintf("%v", currentPort)}},
 			},
 		},
 	},