Просмотр исходного кода

Server test runs: try default interface names for both Linux and macOS

Rod Hynes 9 лет назад
Родитель
Сommit
60a8154754
2 измененных файлов с 16 добавлено и 2 удалено
  1. 8 1
      psiphon/server/server_test.go
  2. 8 1
      psiphon/upstreamproxy/upstreamproxy_test.go

+ 8 - 1
psiphon/server/server_test.go

@@ -109,7 +109,14 @@ func runServer(t *testing.T, runConfig *runServerConfig) {
 
 	// create a server
 
-	serverIPaddress, err := psiphon.GetInterfaceIPAddress("en0")
+	var err error
+	serverIPaddress := ""
+	for _, interfaceName := range []string{"eth0", "en0"} {
+		serverIPaddress, err = psiphon.GetInterfaceIPAddress(interfaceName)
+		if err == nil {
+			break
+		}
+	}
 	if err != nil {
 		t.Fatalf("error getting server IP address: %s", err)
 	}

+ 8 - 1
psiphon/upstreamproxy/upstreamproxy_test.go

@@ -69,7 +69,14 @@ func runServer(t *testing.T, tunnelProtocol string) {
 
 	// create a server
 
-	serverIPaddress, err := psiphon.GetInterfaceIPAddress("en0")
+	var err error
+	serverIPaddress := ""
+	for _, interfaceName := range []string{"eth0", "en0"} {
+		serverIPaddress, err = psiphon.GetInterfaceIPAddress(interfaceName)
+		if err == nil {
+			break
+		}
+	}
 	if err != nil {
 		t.Fatalf("error getting server IP address: %s", err)
 	}