Fix tests

Change-Id: I9b8dbe26bfe6d1d32cbce09a89b7d0f47d7ef4b5
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

1 files changed, 28 insertions, 17 deletions

diff --git a/test/exec_test.go b/test/exec_test.go
index 884ba87..f4d1ac4 100644
--- a/test/exec_test.go
+++ b/test/exec_test.go
@@ -38,7 +38,9 @@ func InitExec(t *testing.T) string {
 
 	/*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)
+	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
 }
@@ -75,21 +77,35 @@ func TestExec(t *testing.T) {
 	assert.Nil(t, HTTPCli.Post("/folders", fPrj, &cfg))
 	assert.NotNil(t, cfg)
 
-	/*channel for ExecOutMsg*/
+	/*channel for ExecExitMsg*/
 	chExec := make(chan xsapiv1.ExecExitMsg)
 	defer close(chExec)
-	/*connect to ExecOutEvent*/
 	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
+	})
+
+	/*basic check: verify that environment is set correctly (use the right sdk)*/
+	var execRes xsapiv1.ExecArgs
+	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*/
-	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 + " && "
@@ -98,22 +114,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))
-	exitMsg := <-chExec
+	exitMsg = <-chExec
 	assert.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 + "&&"