Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
test exec: waiting exit event after exec cmd
[src/xds/xds-server.git]
/
test
/
exec_test.go
diff --git
a/test/exec_test.go
b/test/exec_test.go
index
ff67322
..
884ba87
100644
(file)
--- a/
test/exec_test.go
+++ b/
test/exec_test.go
@@
-22,37
+22,30
@@
import (
"os/exec"
"path"
"testing"
"os/exec"
"path"
"testing"
- "time"
"gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
"github.com/stretchr/testify/assert"
)
func InitExec(t *testing.T) string {
"gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
"github.com/stretchr/testify/assert"
)
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())
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", "https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git", subHelloworldAppTemplateDir)
assert.Nil(t, cmd.Run())
return helloworldDir
}
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
}
-/*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)
func TestExec(t *testing.T) {
helloworldDir := InitExec(t)
+ /*channel for SDK events*/
chSdks := make(chan xsapiv1.SDK)
defer close(chSdks)
sdk := xsapiv1.SDKInstallArgs{
chSdks := make(chan xsapiv1.SDK)
defer close(chSdks)
sdk := xsapiv1.SDKInstallArgs{
@@
-63,6
+56,7
@@
func TestExec(t *testing.T) {
ConnectSDKStateChange(t, sCli, chSdks)
sdkRes := installFakeSdk(t, sdk, chSdks)
ConnectSDKStateChange(t, sCli, chSdks)
sdkRes := installFakeSdk(t, sdk, chSdks)
+ /*check there is no project*/
var cfgArray []xsapiv1.FolderConfig
assert.Nil(t, HTTPCli.Get("/folders", &cfgArray))
assert.Equal(t, len(cfgArray), 0)
var cfgArray []xsapiv1.FolderConfig
assert.Nil(t, HTTPCli.Get("/folders", &cfgArray))
assert.Equal(t, len(cfgArray), 0)
@@
-76,16
+70,20
@@
func TestExec(t *testing.T) {
ServerPath: helloworldDir,
},
}
ServerPath: helloworldDir,
},
}
+ /*create project*/
var cfg xsapiv1.FolderConfig
assert.Nil(t, HTTPCli.Post("/folders", fPrj, &cfg))
assert.NotNil(t, cfg)
var cfg xsapiv1.FolderConfig
assert.Nil(t, HTTPCli.Post("/folders", fPrj, &cfg))
assert.NotNil(t, cfg)
- chExec := make(chan xsapiv1.ExecOutMsg)
+ /*channel for ExecOutMsg*/
+ chExec := make(chan xsapiv1.ExecExitMsg)
defer close(chExec)
defer close(chExec)
- sCli.Conn.On(xsapiv1.ExecOutEvent, func(ev xsapiv1.ExecOutMsg) {
+ /*connect to ExecOutEvent*/
+ sCli.Conn.On(xsapiv1.ExecExitEvent, func(ev xsapiv1.ExecExitMsg) {
chExec <- ev
})
chExec <- ev
})
+ /*cmake helloworld project with fake sdk*/
sdkSourceFile := path.Join(sdkRes.Path, "environment-setup-corei7-64-native-linux")
cmd := "source " + sdkSourceFile
cmd = cmd + " && "
sdkSourceFile := path.Join(sdkRes.Path, "environment-setup-corei7-64-native-linux")
cmd := "source " + sdkSourceFile
cmd = cmd + " && "
@@
-99,14
+97,18
@@
func TestExec(t *testing.T) {
cmd = cmd + " && "
cmd = cmd + "cmake .."
cmd = cmd + " && "
cmd = cmd + "cmake .."
+ /*post exec cmd cmake*/
exec := xsapiv1.ExecArgs{
ID: cfg.ID,
Cmd: cmd,
}
var execRes 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))
assert.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
- flushChannelExec(chExec, 1000)
+ exitMsg := <-chExec
+ assert.Equal(t, exitMsg.Code, 0)
+ /*make helloworld project with fake sdk*/
cmd = "source " + sdkSourceFile
cmd = cmd + " && "
cmd = cmd + "unset SDKTARGETSYSROOT"
cmd = "source " + sdkSourceFile
cmd = cmd + " && "
cmd = cmd + "unset SDKTARGETSYSROOT"
@@
-117,15
+119,19
@@
func TestExec(t *testing.T) {
cmd = cmd + "&&"
cmd = cmd + "make"
exec.Cmd = cmd
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))
assert.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
- flushChannelExec(chExec, 1000)
+ exitMsg = <-chExec
+ assert.Equal(t, exitMsg.Code, 0)
- /*check afb-helloworld.so exists*/
+ /*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)
_, 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))
assert.Nil(t, HTTPCli.Delete("/folders/"+cfg.ID, &cfg))
-
RemoveSdk(t, sdkRes, chSdks)
DisconnectSDKStateChange(t, sCli)
}
RemoveSdk(t, sdkRes, chSdks)
DisconnectSDKStateChange(t, sCli)
}