summaryrefslogtreecommitdiffstats
path: root/test/exec_test.go
diff options
context:
space:
mode:
authorClément Bénier <clement.benier@iot.bzh>2018-08-17 16:45:30 +0200
committerClément Bénier <clement.benier@iot.bzh>2018-08-21 11:08:36 +0200
commitcf3266b208d3ba0fb8f172c29725768bbd41d509 (patch)
tree38d02eebce990c9483c6fcc92497c85ecd3479c6 /test/exec_test.go
parent2b69031e72c3f8370804ceacb8fab7b8899d14f3 (diff)
test exec: remove git2go and cloning afb-helloworld
replace it by fixtures in test/helloworld and copying repo to XDS_SERVER_ROOT_CFG_DIR and cloning app-templates repo into it Change-Id: I4f3d9cfae0f1b81bd7994e172235b1fbc25fd383 Signed-off-by: Clément Bénier <clement.benier@iot.bzh>
Diffstat (limited to 'test/exec_test.go')
-rw-r--r--test/exec_test.go56
1 files changed, 20 insertions, 36 deletions
diff --git a/test/exec_test.go b/test/exec_test.go
index 5d4c106..f2d48ce 100644
--- a/test/exec_test.go
+++ b/test/exec_test.go
@@ -17,17 +17,29 @@
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 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
+}
+
/*flush channel with timeout*/
func flushChannelExec(channel chan xsapiv1.ExecOutMsg, ms time.Duration) {
timeoutB := false
@@ -40,31 +52,7 @@ func flushChannelExec(channel chan xsapiv1.ExecOutMsg, ms time.Duration) {
}
}
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)
- }
-
- 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")
+ helloworldDir := InitExec(t)
var cfgArray []xsapiv1.FolderConfig
assert.Nil(t, HTTPCli.Get("/folders", &cfgArray))
@@ -72,11 +60,11 @@ 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
@@ -89,9 +77,7 @@ func TestExec(t *testing.T) {
chExec <- ev
})
- cmd := "export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig/"
- cmd = cmd + " && "
- cmd = cmd + "cd " + fPrj.ClientPath
+ cmd := "cd " + fPrj.ClientPath
cmd = cmd + " && "
cmd = cmd + "mkdir -p build"
cmd = cmd + " && "
@@ -107,9 +93,7 @@ func TestExec(t *testing.T) {
assert.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
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 + "&&"
@@ -119,7 +103,7 @@ func TestExec(t *testing.T) {
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))