X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fexec_test.go;h=e7992d60870112fd7906deb87b73bfab25a93c44;hb=5dc2ff003106f0ced38caadb06033f24c792f9b9;hp=1ab781a1fb764a6b399b514c556b9842d1ccd903;hpb=b1d091a8c6b2269601a1683e963d0e382cd0f7f6;p=src%2Fxds%2Fxds-server.git

diff --git a/test/exec_test.go b/test/exec_test.go
index 1ab781a..e7992d6 100644
--- a/test/exec_test.go
+++ b/test/exec_test.go
@@ -22,10 +22,9 @@ import (
 	"os/exec"
 	"path"
 	"testing"
-	"time"
 
-	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
-	"github.com/stretchr/testify/assert"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
+	"github.com/stretchr/testify/require"
 )
 
 func InitExec(t *testing.T) string {
@@ -35,26 +34,17 @@ func InitExec(t *testing.T) string {
 	cmd := exec.Command("cp", "-r", helloworldFixturesDir, helloworldDir)
 	var out bytes.Buffer
 	cmd.Stdout = &out
-	assert.Nil(t, cmd.Run())
+	require.Nil(t, cmd.Run())
 
 	/*clone submodules app templates into helloworld*/
 	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())
+	cmd = exec.Command("git", "clone", "-b", "flounder",
+		"https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git",
+		subHelloworldAppTemplateDir)
+	require.Nil(t, cmd.Run())
 	return helloworldDir
 }
 
-/*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 TestExec(t *testing.T) {
 	helloworldDir := InitExec(t)
 	/*channel for SDK events*/
@@ -70,8 +60,8 @@ func TestExec(t *testing.T) {
 
 	/*check there is no project*/
 	var cfgArray []xsapiv1.FolderConfig
-	assert.Nil(t, HTTPCli.Get("/folders", &cfgArray))
-	assert.Equal(t, len(cfgArray), 0)
+	require.Nil(t, HTTPCli.Get("/folders", &cfgArray))
+	require.Equal(t, len(cfgArray), 0)
 
 	fPrj := xsapiv1.FolderConfig{
 		Label:      "testproject",
@@ -84,24 +74,48 @@ func TestExec(t *testing.T) {
 	}
 	/*create project*/
 	var cfg xsapiv1.FolderConfig
-	assert.Nil(t, HTTPCli.Post("/folders", fPrj, &cfg))
-	assert.NotNil(t, cfg)
+	require.Nil(t, HTTPCli.Post("/folders", fPrj, &cfg))
+	require.NotNil(t, cfg)
 
-	/*channel for ExecOutMsg*/
-	chExec := make(chan xsapiv1.ExecOutMsg)
+	/*channel for ExecExitMsg*/
+	chExec := make(chan xsapiv1.ExecExitMsg)
 	defer close(chExec)
-	/*connect to ExecOutEvent*/
-	sCli.Conn.On(xsapiv1.ExecOutEvent, func(ev xsapiv1.ExecOutMsg) {
+	sCli.Conn.On(xsapiv1.ExecExitEvent, func(ev xsapiv1.ExecExitMsg) {
 		chExec <- ev
 	})
 
+	/*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 = ""
+	require.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 = ""
+	require.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
+	exitMsg := <-chExec
+	require.Equal(t, exitMsg.Code, 0)
+
 	/*cmake helloworld project with fake sdk*/
-	sdkSourceFile := path.Join(sdkRes.Path, "environment-setup-corei7-64-native-linux")
-	cmd := "source " + sdkSourceFile
-	cmd = cmd + " && "
-	cmd = cmd + "unset SDKTARGETSYSROOT"
-	cmd = cmd + " && "
-	cmd = cmd + "cd " + fPrj.ClientPath
+	cmd = "cd " + fPrj.ClientPath
 	cmd = cmd + " && "
 	cmd = cmd + "mkdir -p build"
 	cmd = cmd + " && "
@@ -110,21 +124,17 @@ func TestExec(t *testing.T) {
 	cmd = cmd + "cmake .."
 
 	/*post exec cmd cmake*/
-	exec := xsapiv1.ExecArgs{
+	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) //waiting for execOutMsg
+	require.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
+	exitMsg = <-chExec
+	require.Equal(t, exitMsg.Code, 0)
 
 	/*make helloworld project with fake sdk*/
-	cmd = "source " + sdkSourceFile
-	cmd = cmd + " && "
-	cmd = cmd + "unset SDKTARGETSYSROOT"
-	cmd = cmd + " && "
-	cmd = cmd + "cd " + fPrj.ClientPath
+	cmd = "cd " + fPrj.ClientPath
 	cmd = cmd + "&&"
 	cmd = cmd + "cd build"
 	cmd = cmd + "&&"
@@ -132,16 +142,17 @@ func TestExec(t *testing.T) {
 	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) //waiting for execOutMsg
+	require.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
+	exitMsg = <-chExec
+	require.Equal(t, exitMsg.Code, 0)
 
 	/*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)
+	require.Nil(t, err)
 
 	/*deinit*/
-	assert.Nil(t, HTTPCli.Delete("/folders/"+cfg.ID, &cfg))
+	require.Nil(t, HTTPCli.Delete("/folders/"+cfg.ID, &cfg))
 	RemoveSdk(t, sdkRes, chSdks)
 	DisconnectSDKStateChange(t, sCli)
 }