Adjust test cases to support automated test

Signed-off-by: bill fort <fxbao@hotmail.com>

.github/workflows/go.yml

@@ -4,7 +4,7 @@
 name: Go
 
 on:
-  [push]
+  [push, pull_request, workflow_dispatch]
 
 jobs:
 

tests/config.go

@@ -14,18 +14,4 @@ const (
 	httpServiceUrl = "http://" + httpServerAddr + "/httpEcho"
 
 	tunaNodeStarted = "tuna node is started"
-
-	webServerIsReady = "web server is ready"
-	webServerExited  = "web server exited"
-	webClientExited  = "web client exited"
-
-	tcpServerIsReady = "tcp server is ready"
-	tcpServerExited  = "tcp server exited"
-	tcpClientExited  = "tcp client exited"
-
-	udpServerIsReady = "udp server is ready"
-	udpServerExited  = "udp server exited"
-	udpClientExited  = "udp client exited"
-
-	exited = "exited"
 )

tests/dns.go

@@ -0,0 +1,19 @@
+package tests
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/txthinking/brook"
+)
+
+func dnsQuery() {
+	for i := 1; i <= rounds; i++ {
+		err := brook.Socks5Test(proxyAddr, "", "", "http3.ooo", "137.184.237.95", "8.8.8.8:53")
+		if err != nil {
+			fmt.Printf("TestDNSProxy try %v err: %v\n", i, err)
+			time.Sleep(time.Duration(i) * time.Second)
+			break
+		}
+	}
+}

tests/main_test.go

@@ -3,13 +3,17 @@ package tests
 import (
 	"os"
 	"testing"
+	"time"
 )
 
 func TestMain(m *testing.M) {
 	go StartTcpServer()
 	go StartWebServer()
 	go StartUdpServer()
 
+	go StartNconnectServerWithTunaNode(true, true, false)
+	time.Sleep(15 * time.Second)
+
 	exitVal := m.Run()
 	os.Exit(exitVal)
 }

tests/proxy_test.go

@@ -0,0 +1,25 @@
+package tests
+
+import (
+	"fmt"
+	"testing"
+	"time"
+)
+
+// go test -v -run=TestProxy
+func TestProxy(t *testing.T) {
+	tuna, udp, tun := true, true, false
+	go func() {
+		err := startNconnect("client.json", tuna, udp, tun, nil)
+		if err != nil {
+			fmt.Printf("start nconnect client err: %v\n", err)
+			return
+		}
+	}()
+	time.Sleep(15 * time.Second)
+
+	dnsQuery()
+	StartWebClient()
+	StartTCPClient()
+	StartUDPClient()
+}

tests/pub.go

@@ -52,9 +52,9 @@ func startNconnect(configFile string, tuna, udp, tun bool, n *types.Node) error
 	}
 
 	if opts.Client {
-		port++
 		proxyAddr = fmt.Sprintf("127.0.0.1:%v", port)
 		opts.LocalSocksAddr = proxyAddr
+		port++
 	}
 	nc, _ := nconnect.NewNconnect(opts)
 	if opts.Server {