X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fexec_test.go;h=f2d48ce79d698ac6cb6ec12e407d8212a5b224e0;hb=cf3266b208d3ba0fb8f172c29725768bbd41d509;hp=8fb6519ff7d9af0eada6c88f1e514931fdbf6d47;hpb=8b84b5cac636d639040fc9a7da485263ffbc9a09;p=src%2Fxds%2Fxds-server.git

diff --git a/test/exec_test.go b/test/exec_test.go
index 8fb6519..f2d48ce 100644
--- a/test/exec_test.go
+++ b/test/exec_test.go
@@ -17,43 +17,42 @@
 package xdsservertest
 
 import (
-	"log"
+	"bytes"
 	"os"
+	"os/exec"
 	"path"
 	"testing"
 	"time"
 
 	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
-	git "github.com/libgit2/git2go"
 	"github.com/stretchr/testify/assert"
 )
 
-func TestExec(t *testing.T) {
-	cloneRepo := "https://github.com/iotbzh/helloworld-service.git"
-	cloneDir := path.Join(os.Getenv(envRootCfgDir), "testExec")
-	t.Logf("Cloning repo %v in %v\n...\n", cloneRepo, cloneDir)
-	var cloneOptions git.CloneOptions
-	repository, err := git.Clone(cloneRepo, cloneDir, &cloneOptions)
-	if err != nil {
-		t.Fatal(err)
-	}
+func InitExec(t *testing.T) string {
+	helloworldDir := path.Join(os.Getenv(envRootCfgDir), "helloworld")
+	cmd := exec.Command("cp", "-r", helloworldFixturesDir, helloworldDir)
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	assert.Nil(t, cmd.Run())
+	subHelloworldAppTemplateDir := path.Join(helloworldDir, "conf.d", "app-templates")
+	cmd = exec.Command("git", "clone", "https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git", subHelloworldAppTemplateDir)
+	assert.Nil(t, cmd.Run())
+	return helloworldDir
+}
 
-	repository.Submodules.Foreach(func(sub *git.Submodule, name string) int {
-		sub.Init(true)
-		err := sub.Update(true, &git.SubmoduleUpdateOptions{
-			&git.CheckoutOpts{
-				Strategy: git.CheckoutForce | git.CheckoutUpdateSubmodules,
-			},
-			&git.FetchOptions{},
-		})
-		if err != nil {
-			log.Fatal(err)
+/*flush channel with timeout*/
+func flushChannelExec(channel chan xsapiv1.ExecOutMsg, ms time.Duration) {
+	timeoutB := false
+	for !timeoutB {
+		select {
+		case <-channel:
+		case <-time.After(ms * time.Millisecond):
+			timeoutB = true
 		}
-		return 0
-
-	})
-
-	t.Logf("repo cloned\n")
+	}
+}
+func TestExec(t *testing.T) {
+	helloworldDir := InitExec(t)
 
 	var cfgArray []xsapiv1.FolderConfig
 	assert.Nil(t, HTTPCli.Get("/folders", &cfgArray))
@@ -61,24 +60,24 @@ func TestExec(t *testing.T) {
 
 	fPrj := xsapiv1.FolderConfig{
 		Label:      "testproject",
-		ClientPath: cloneDir,
+		ClientPath: helloworldDir,
 		Type:       xsapiv1.TypePathMap,
 		ClientData: "clientdatatest",
 		DataPathMap: xsapiv1.PathMapConfig{
-			ServerPath: cloneDir,
+			ServerPath: helloworldDir,
 		},
 	}
 	var cfg xsapiv1.FolderConfig
 	assert.Nil(t, HTTPCli.Post("/folders", fPrj, &cfg))
 	assert.NotNil(t, cfg)
-	_, err = NewIoSocketClient(prefixURL, HTTPCli.GetClientID())
-	if err != nil {
-		t.Fatal(err)
-	}
 
-	cmd := "export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig/"
-	cmd = cmd + " && "
-	cmd = cmd + "cd " + fPrj.ClientPath
+	chExec := make(chan xsapiv1.ExecOutMsg)
+	defer close(chExec)
+	sCli.Conn.On(xsapiv1.ExecOutEvent, func(ev xsapiv1.ExecOutMsg) {
+		chExec <- ev
+	})
+
+	cmd := "cd " + fPrj.ClientPath
 	cmd = cmd + " && "
 	cmd = cmd + "mkdir -p build"
 	cmd = cmd + " && "
@@ -92,21 +91,19 @@ func TestExec(t *testing.T) {
 	}
 	var execRes xsapiv1.ExecArgs
 	assert.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
-	time.Sleep(3 * time.Second) //maybe waiting for an event would be better
+	flushChannelExec(chExec, 1000)
 
-	cmd = "export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig/"
-	cmd = cmd + "&&"
-	cmd = cmd + "cd " + fPrj.ClientPath
+	cmd = "cd " + fPrj.ClientPath
 	cmd = cmd + "&&"
 	cmd = cmd + "cd build"
 	cmd = cmd + "&&"
 	cmd = cmd + "make"
 	exec.Cmd = cmd
 	assert.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
-	time.Sleep(3 * time.Second) //maybe waiting for an event would be better
+	flushChannelExec(chExec, 1000)
 
 	/*check afb-helloworld.so exists*/
-	_, err = os.Stat(path.Join(fPrj.ClientPath, "build/helloworld-afb/afb-helloworld.so"))
+	_, err := os.Stat(path.Join(fPrj.ClientPath, "build/helloworld/helloworld.so"))
 	assert.Nil(t, err)
 
 	assert.Nil(t, HTTPCli.Delete("/folders/"+cfg.ID, &cfg))