X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fxdsserver_test.go;h=b8e98b5fe5920e1de5b35baeb9a4c8dab7b132d9;hb=72bb1c521aff5bb166db287ef426b243166d8927;hp=585ad5079d5c042e74f16fcc4e376c6b87abf166;hpb=e0e1d75c08ff6187acabca74261ebeb0e0893ede;p=src%2Fxds%2Fxds-server.git

diff --git a/test/xdsserver_test.go b/test/xdsserver_test.go
index 585ad50..b8e98b5 100644
--- a/test/xdsserver_test.go
+++ b/test/xdsserver_test.go
@@ -22,7 +22,6 @@ import (
 	"log"
 	"os"
 	"os/exec"
-	"path"
 	"sync"
 	"testing"
 	"time"
@@ -46,7 +45,6 @@ type IOSockClient struct {
 //global client
 var HTTPCli *common.HTTPClient
 var logDir string
-var sdkDir string
 var sCli *IOSockClient
 
 func Copy(src, dst string) error {
@@ -71,17 +69,19 @@ func Copy(src, dst string) error {
 
 func initEnv(launchProcess bool) {
 	if launchProcess {
+		/*kill xds-server if needed*/
 		cmd := exec.Command("killall", "-9", "xds-server")
 		if err := cmd.Start(); err != nil {
 			log.Fatal(err)
 		}
 		cmd.Wait()
 	}
+	/*set environment variable*/
 	rootTestLog := "/tmp/xds-server-test"
 	if err := os.Setenv(envRootCfgDir, rootTestLog); err != nil {
 		log.Fatal(err)
 	}
-	sdkDir = rootTestLog + "/sdks/"
+	sdkDir := rootTestLog + "/sdks/"
 	if err := os.Setenv(envXdtSdk, sdkDir); err != nil {
 		log.Fatal(err)
 	}
@@ -94,20 +94,14 @@ func initEnv(launchProcess bool) {
 	if err := os.Setenv("XDS_LOG_SILLY", "1"); err != nil {
 		log.Fatal(err)
 	}
+	/*remove and recreate working directories*/
 	os.RemoveAll(rootTestLog)
 	os.MkdirAll(rootTestLog, 0755)
 	logDir = rootTestLog + "/logs/"
 	os.MkdirAll(logDir, 0755)
-	os.MkdirAll(sdkDir, 0755)
-	currentDir, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-	if err := Copy(path.Join(currentDir, sdkFile), path.Join(sdkDir, sdkFileName)); err != nil {
-		log.Fatal(err)
-	}
 }
 
+/*prepare xds-server process*/
 func launchXdsServer(proc **os.Process) *os.File {
 	logFile := logDir + logFileXdsServer
 	file, err := os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY, 0644)
@@ -152,7 +146,6 @@ func getHTTPClient(lvl int) (*common.HTTPClient, *os.File) {
 }
 
 func NewIoSocketClient(url, clientID string) (*IOSockClient, error) {
-
 	var err error
 
 	sCli := &IOSockClient{
@@ -162,7 +155,6 @@ func NewIoSocketClient(url, clientID string) (*IOSockClient, error) {
 			Transport: "websocket",
 			Header:    make(map[string][]string),
 		},
-		//ServerDiscoChan: make(chan Disconnection, 1),
 	}
 	sCli.Options.Header["XDS-SID"] = []string{clientID}
 
@@ -180,11 +172,14 @@ func NewIoSocketClient(url, clientID string) (*IOSockClient, error) {
 		sCli.Connected = false
 	})
 
+	log.Printf("Connect websocket with url=%v clientId=%v\n", prefixURL, HTTPCli.GetClientID())
 	return sCli, nil
 }
 func TestMain(m *testing.M) {
+	/* useful for debugging, preventing from launching xds-server
+	 * it can be launch separetly */
 	launchProcess := true
-	log.Printf("TestMain: launchProcess is %v", launchProcess)
+	log.Printf("TestMain: launchProcess is %v, so launching xds-server", launchProcess)
 	initEnv(launchProcess)
 
 	var proc *os.Process
@@ -192,6 +187,7 @@ func TestMain(m *testing.M) {
 	if launchProcess {
 		fileXdsServer = launchXdsServer(&proc)
 		go func(p *os.Process) {
+			log.Print("xds-server is launching")
 			if status, err := p.Wait(); err != nil {
 				log.Fatalf("status=%v\n err=%v\n", status, err)
 			}
@@ -211,14 +207,9 @@ func TestMain(m *testing.M) {
 		log.Fatal(err)
 	}
 
-	log.Printf("HTTPCli id is %v", HTTPCli.GetClientID())
-
 	if HTTPCli == nil {
 		log.Fatal("HTTPCLi is nil")
 	}
 	res := m.Run()
 	defer os.Exit(res)
 }
-
-func init() {
-}