Fix ParseHostOrURL and enable expect tests

network/wsNetwork.go

@@ -1913,6 +1913,8 @@ var errBcastQFull = errors.New("broadcast queue full")
 
 var errURLNoHost = errors.New("could not parse a host from url")
 
+var errURLColonHost = errors.New("host name starts with a colon")
+
 // HostColonPortPattern matches "^[-a-zA-Z0-9.]+:\\d+$" e.g. "foo.com.:1234"
 var HostColonPortPattern = regexp.MustCompile("^[-a-zA-Z0-9.]+:\\d+$")
 
@@ -1937,6 +1939,11 @@ func ParseHostOrURL(addr string) (*url.URL, error) {
 	// This turns "[::]:4601" into "http://[::]:4601" which url.Parse can do
 	parsed, e2 := url.Parse("http://" + addr)
 	if e2 == nil {
+		// https://datatracker.ietf.org/doc/html/rfc1123#section-2
+		// first character is relaxed to allow either a letter or a digit
+		if parsed.Host[0] == ':' && (len(parsed.Host) < 2 || parsed.Host[1] != ':') {
+			return nil, errURLColonHost
+		}
 		return parsed, nil
 	}
 	return parsed, err /* return original err, not our prefix altered try */

network/wsNetwork_test.go

@@ -2067,6 +2067,7 @@ func TestParseHostOrURL(t *testing.T) {
 		{"1.2.3.4:123", url.URL{Scheme: "http", Host: "1.2.3.4:123"}},
 		{"[::]:123", url.URL{Scheme: "http", Host: "[::]:123"}},
 		{"r2-devnet.devnet.algodev.network:4560", url.URL{Scheme: "http", Host: "r2-devnet.devnet.algodev.network:4560"}},
+		{"::11.22.33.44:123", url.URL{Scheme: "http", Host: "::11.22.33.44:123"}},
 	}
 	badUrls := []string{
 		"justahost",
@@ -2078,6 +2079,15 @@ func TestParseHostOrURL(t *testing.T) {
 		"//localhost:WAT",
 		"://badaddress", // See rpcs/blockService_test.go TestRedirectFallbackEndpoints
 		"://localhost:1234",
+		":xxx",
+		":xxx:1234",
+		"::11.22.33.44",
+		":a:1",
+		":a:",
+		":1",
+		":a",
+		":",
+		"",
 	}
 	for _, tc := range urlTestCases {
 		t.Run(tc.text, func(t *testing.T) {

test/e2e-go/cli/goal/expect/goalCmdFlagsTest.exp

@@ -24,7 +24,7 @@ if { [catch {
     TestGoalCommandLineFlags "goal node start -p :xxx:445" ".*is not a valid peer address.*"
     TestGoalCommandLineFlags "goal node start -p {http://1.2.3.4:5050;:xxx:445}" ".*is not a valid peer address.*"
     TestGoalCommandLineFlags "goal node start -p http://1.2.3.4:5050" "^Data directory not specified.*"
-    TestGoalCommandLineFlags "goal node start -p {http://1.2.3.4:5050;5.6.7.8}" "^Data directory not specified.*"
+    TestGoalCommandLineFlags "goal node start -p {http://1.2.3.4:5050;5.6.7.8:1234}" "^Data directory not specified.*"
 
 } EXCEPTION ] } {
     puts "ERROR in Goal Start Validity test: $EXCEPTION"

test/e2e-go/cli/goal/expect/goalExpectCommon.exp

@@ -112,7 +112,7 @@ proc ::AlgorandGoal::StartNode { TEST_ALGO_DIR {SYSTEMD_MANAGED "False"} {PEER_A
         if { $SYSTEMD_MANAGED eq "True" } {
             expect {
                 timeout { close; ::AlgorandGoal::Abort "Did not receive appropriate message during node start" }
-                "^This node is managed by systemd, you must run the following command to make your desired state change to your node:*" { puts "Goal showed correct error message for systemd" ; close}
+                "^This node is using systemd and should be managed with systemctl*" { puts "Goal showed correct error message for systemd" ; close}
                 eof { ::AlgorandGoal::CheckEOF "Unable to start network" }
             }
         } else {
@@ -146,7 +146,7 @@ proc ::AlgorandGoal::StopNode { TEST_ALGO_DIR {SYSTEMD_MANAGED ""} } {
             spawn goal node stop -d $TEST_ALGO_DIR
             expect {
                 timeout { close; ::AlgorandGoal::Abort "Did not receive appropriate message during node stop" }
-                "*This node is managed by systemd, you must run the following command to make your desired state change to your node:*" { puts "Goal showed correct error message for systemd" ; close}
+                "^This node is using systemd and should be managed with systemctl*" { puts "Goal showed correct error message for systemd" ; close}
                 eof { close; ::AlgorandGoal::Abort "Did not receive appropriate message before goal command completion" }
             }
         }
@@ -173,7 +173,7 @@ proc ::AlgorandGoal::RestartNode { TEST_ALGO_DIR {SYSTEMD_MANAGED ""} } {
             spawn goal node restart -d $TEST_ALGO_DIR
             expect {
                 timeout { close; ::AlgorandGoal::Abort "Did not receive appropriate message during node restart" }
-                "^This node is managed by systemd, you must run the following command to make your desired state change to your node:*" { puts "Goal showed correct error message for systemd" ; close}
+                "^This node is using systemd and should be managed with systemctl*" { puts "Goal showed correct error message for systemd" ; close}
             }
         }
     } EXCEPTION] } {

test/e2e-go/cli/goal/expect/goal_expect_test.go

@@ -24,7 +24,6 @@ import (
 
 // TestGoalWithExpect Process all expect script files with suffix Test.exp within the test/e2e-go/cli/goal/expect directory
 func TestGoalWithExpect(t *testing.T) {
-	t.Skip("goal expect test are disabled due to flakiness")
 	et := fixtures.MakeExpectTest(t)
 	et.Run()
 }

test/e2e-go/cli/goal/expect/tealConsensusTest.exp

@@ -68,7 +68,8 @@ if { [catch {
         "\n" { ::AlgorandGoal::Abort $expect_out(buffer) }
     }
 
-    teal "$TEST_ROOT_DIR/big-app.teal" 2 4097 1 "int 0\nbalance\npop\n"
+    # MaxAppProgramLen = 2K * (1 + 3 pages max)
+    teal "$TEST_ROOT_DIR/big-app.teal" 2 8192 1 "int 0\nbalance\npop\n"
     spawn goal clerk compile "$TEST_ROOT_DIR/big-app.teal"
     expect {
         -re {[A-Z2-9]{58}} { ::AlgorandGoal::Abort "hash" }

test/framework/fixtures/expectFixture.go

@@ -113,8 +113,15 @@ func MakeExpectTest(t *testing.T) *ExpectFixture {
 
 // Run Process all expect script files with suffix Test.exp within the current directory
 func (ef *ExpectFixture) Run() {
+	disabledTest := map[string]bool{
+		"pingpongTest.exp": true,
+	}
 	for testName := range ef.expectFiles {
 		if match, _ := regexp.MatchString(ef.testFilter, testName); match {
+			if disabledTest[testName] {
+				continue
+			}
+
 			ef.t.Run(testName, func(t *testing.T) {
 				partitiontest.PartitionTest(t) // Check if this expect test should by run, may SKIP