X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fexec_test.go;h=39f00c6562f5df2a9cf621887e3ad8fadc431da0;hb=3e3222406a6f015a9fee3720e8ba76ecf58b087f;hp=5d4c106075d8e6de764e06f8164ca3dc0f8a7d83;hpb=330d6849a51ea6b47d90e9cd6f6ee43a7c2fb10e;p=src%2Fxds%2Fxds-server.git

diff --git a/test/exec_test.go b/test/exec_test.go
index 5d4c106..39f00c6 100644
--- a/test/exec_test.go
+++ b/test/exec_test.go
@@ -17,81 +17,105 @@
 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"
 )
 
-/*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
-		}
-	}
+func InitExec(t *testing.T) string {
+	Debugf(t, "Create helloworld directory with app-templates")
+	/*copy helloworld from fixtures to envRootCfgDir*/
+	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())
+
+	/*clone submodules app templates into helloworld*/
+	subHelloworldAppTemplateDir := path.Join(helloworldDir, "conf.d", "app-templates")
+	cmd = exec.Command("git", "clone", "-b", "flounder",
+		"https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git",
+		subHelloworldAppTemplateDir)
+	assert.Nil(t, cmd.Run())
+	return helloworldDir
 }
+
 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)
+	helloworldDir := InitExec(t)
+	/*channel for SDK events*/
+	chSdks := make(chan xsapiv1.SDK)
+	defer close(chSdks)
+	sdk := xsapiv1.SDKInstallArgs{
+		ID:       "",
+		Filename: sdkFileName,
+		Force:    false,
 	}
+	ConnectSDKStateChange(t, sCli, chSdks)
+	sdkRes := installFakeSdk(t, sdk, chSdks)
 
-	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)
-		}
-		return 0
-
-	})
-
-	t.Logf("repo cloned\n")
-
+	/*check there is no project*/
 	var cfgArray []xsapiv1.FolderConfig
 	assert.Nil(t, HTTPCli.Get("/folders", &cfgArray))
 	assert.Equal(t, len(cfgArray), 0)
 
 	fPrj := xsapiv1.FolderConfig{
 		Label:      "testproject",
-		ClientPath: cloneDir,
+		ClientPath: helloworldDir,
 		Type:       xsapiv1.TypePathMap,
 		ClientData: "clientdatatest",
 		DataPathMap: xsapiv1.PathMapConfig{
-			ServerPath: cloneDir,
+			ServerPath: helloworldDir,
 		},
 	}
+	/*create project*/
 	var cfg xsapiv1.FolderConfig
 	assert.Nil(t, HTTPCli.Post("/folders", fPrj, &cfg))
 	assert.NotNil(t, cfg)
 
-	chExec := make(chan xsapiv1.ExecOutMsg)
+	/*channel for ExecExitMsg*/
+	chExec := make(chan xsapiv1.ExecExitMsg)
 	defer close(chExec)
-	sCli.Conn.On(xsapiv1.ExecOutEvent, func(ev xsapiv1.ExecOutMsg) {
+	sCli.Conn.On(xsapiv1.ExecExitEvent, func(ev xsapiv1.ExecExitMsg) {
 		chExec <- ev
 	})
 
-	cmd := "export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig/"
-	cmd = cmd + " && "
-	cmd = cmd + "cd " + fPrj.ClientPath
+	/*Collect commands output in */
+	cmdOut := ""
+	sCli.Conn.On(xsapiv1.ExecOutEvent, func(ev xsapiv1.ExecOutMsg) {
+		cmdOut += ev.Stdout + ev.Stderr
+	})
+	/*error when exec with fakeid*/
+	var execRes xsapiv1.ExecArgs
+	cmd := "pwd && echo \"SDKTARGETSYSROOT=<$SDKTARGETSYSROOT>\""
+	exec := xsapiv1.ExecArgs{
+		ID:    cfg.ID,
+		Cmd:   cmd,
+		SdkID: "11111-invalid",
+	}
+	Debugf(t, "exec cmake cmd(%v)", cmd)
+	cmdOut = ""
+	assert.NotNil(t, HTTPCli.Post("/exec", exec, &execRes))
+
+	/*basic check: verify that environment is set correctly (use the right sdk)*/
+	cmd = "pwd && echo \"SDKTARGETSYSROOT=<$SDKTARGETSYSROOT>\""
+	exec = xsapiv1.ExecArgs{
+		ID:    cfg.ID,
+		Cmd:   cmd,
+		SdkID: sdkRes.ID,
+	}
+	Debugf(t, "exec cmake cmd(%v)", cmd)
+	cmdOut = ""
+	assert.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
+	exitMsg := <-chExec
+	assert.Equal(t, exitMsg.Code, 0)
+
+	/*cmake helloworld project with fake sdk*/
+	cmd = "cd " + fPrj.ClientPath
 	cmd = cmd + " && "
 	cmd = cmd + "mkdir -p build"
 	cmd = cmd + " && "
@@ -99,28 +123,36 @@ func TestExec(t *testing.T) {
 	cmd = cmd + " && "
 	cmd = cmd + "cmake .."
 
-	exec := xsapiv1.ExecArgs{
+	/*post exec cmd cmake*/
+	exec = xsapiv1.ExecArgs{
 		ID:  cfg.ID,
 		Cmd: cmd,
 	}
-	var execRes xsapiv1.ExecArgs
+	Debugf(t, "exec cmake cmd(%v)", cmd)
 	assert.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
-	flushChannelExec(chExec, 1000)
+	exitMsg = <-chExec
+	assert.Equal(t, exitMsg.Code, 0)
 
-	cmd = "export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig/"
-	cmd = cmd + "&&"
-	cmd = cmd + "cd " + fPrj.ClientPath
+	/*make helloworld project with fake sdk*/
+	cmd = "cd " + fPrj.ClientPath
 	cmd = cmd + "&&"
 	cmd = cmd + "cd build"
 	cmd = cmd + "&&"
 	cmd = cmd + "make"
 	exec.Cmd = cmd
+	/*post exec cmd make*/
+	Debugf(t, "exec make cmd(%v)", cmd)
 	assert.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
-	flushChannelExec(chExec, 1000)
+	exitMsg = <-chExec
+	assert.Equal(t, exitMsg.Code, 0)
 
-	/*check afb-helloworld.so exists*/
-	_, err = os.Stat(path.Join(fPrj.ClientPath, "build/helloworld-afb/afb-helloworld.so"))
+	/*check if helloworld.so exists*/
+	Debug(t, "check that helloworld.so exists")
+	_, err := os.Stat(path.Join(fPrj.ClientPath, "build/helloworld/helloworld.so"))
 	assert.Nil(t, err)
 
+	/*deinit*/
 	assert.Nil(t, HTTPCli.Delete("/folders/"+cfg.ID, &cfg))
+	RemoveSdk(t, sdkRes, chSdks)
+	DisconnectSDKStateChange(t, sCli)
 }