X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fmain_test.go;h=273df09a015d6f0d04cccb55852ecd924186df5c;hb=7b929ebc73b75f080066bef555e95b5a81c5a2ab;hp=68206a923724d0af4275d3dbabb48dddb3f239fe;hpb=c095e1ea9a9e38f020ce4ae852d97c712be910b6;p=src%2Fxds%2Fxds-server.git

diff --git a/test/main_test.go b/test/main_test.go
index 68206a9..273df09 100644
--- a/test/main_test.go
+++ b/test/main_test.go
@@ -47,18 +47,21 @@ var HTTPCli *common.HTTPClient
 var logDir string
 var sCli *IOSockClient
 
+// Debug function used to print debug logs
 func Debug(t *testing.T, args ...interface{}) {
 	if os.Getenv("VERBOSE") != "" {
-		t.Log(args)
+		t.Log(args...)
 	}
 }
 
+// Debugf function used to print debug logs
 func Debugf(t *testing.T, format string, args ...interface{}) {
 	if os.Getenv("VERBOSE") != "" {
-		t.Logf(format, args)
+		t.Logf(format, args...)
 	}
 }
 
+// Copy copies from src to dst until either EOF
 func Copy(src, dst string) error {
 	in, err := os.Open(src)
 	if err != nil {
@@ -82,7 +85,7 @@ func Copy(src, dst string) error {
 func initEnv(launchProcess bool) {
 	if launchProcess {
 		/*kill xds-server if needed*/
-		cmd := exec.Command("killall", "-9", "xds-server")
+		cmd := exec.Command("pkill", "-9", "xds-server")
 		if err := cmd.Start(); err != nil {
 			log.Fatal(err)
 		}
@@ -144,17 +147,17 @@ func getHTTPClient(lvl int) (*common.HTTPClient, *os.File) {
 		LogPrefix:           "XDSSERVERTEST: ",
 		LogLevel:            lvl,
 	}
-	cli, err := common.HTTPNewClient(prefixURL, conf)
+	HTTPcli, err := common.HTTPNewClient(prefixURL, conf)
 	if err != nil {
 		log.Fatal(err)
 	}
-	log.Printf("HTTP session ID : %v", cli.GetClientID())
+	log.Printf("HTTP session ID : %v", HTTPcli.GetClientID())
 	var ver xsapiv1.Version
-	err = cli.Get("/version", &ver)
+	err = HTTPcli.Get("/version", &ver)
 	if err != nil {
 		log.Fatal(err)
 	}
-	return cli, file
+	return HTTPcli, file
 }
 
 func NewIoSocketClient(url, clientID string) (*IOSockClient, error) {
@@ -180,7 +183,9 @@ func NewIoSocketClient(url, clientID string) (*IOSockClient, error) {
 	})
 
 	sCli.Conn.On("disconnection", func(err error) {
-		log.Printf("WS disconnection event with err: %v\n", err)
+		if err != nil {
+			log.Printf("WS disconnection event with err: %v\n", err)
+		}
 		sCli.Connected = false
 	})
 
@@ -189,7 +194,7 @@ func NewIoSocketClient(url, clientID string) (*IOSockClient, error) {
 }
 func TestMain(m *testing.M) {
 	/* useful for debugging, preventing from launching xds-server
-	 * it can be launch separetly */
+	 * it can be launch separately */
 	launchProcess := true
 	log.Printf("TestMain: launchProcess is %v, so launching xds-server", launchProcess)
 	initEnv(launchProcess)