ar0c/goc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

modify cmd interface

Browse Source
This commit is contained in:
lyyyuna 2021-07-22 22:25:55 +08:00
parent b839cb5659
commit 10ba98c6e2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/e2e/cmd.go
View File

@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"os"
"os/exec" "os/exec"
"time" "time"
) )
@ -18,10 +19,15 @@ type LongRunCmd struct {
done bool done bool
} }
func NewLongRunCmd(dir string, args []string) *LongRunCmd { // NewLongRunCmd defines a command which will be run forever
//
// You can specify the whole command arg list, the directory where the command
// will be run in, and the env list.
func NewLongRunCmd(args []string, dir string, envs []string) *LongRunCmd {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
cmd := exec.CommandContext(ctx, args[0], args[1:]...) cmd := exec.CommandContext(ctx, args[0], args[1:]...)
cmd.Dir = dir cmd.Dir = dir
cmd.Env = append(os.Environ(), envs...)
var stderrBuf bytes.Buffer var stderrBuf bytes.Buffer
var stdoutBuf bytes.Buffer var stdoutBuf bytes.Buffer
@ -71,12 +77,13 @@ func (l *LongRunCmd) GetStdoutStdErr() (string, string) {
} }
// RunShortRunCmd defines a cmd which run and exits immediately // RunShortRunCmd defines a cmd which run and exits immediately
func RunShortRunCmd(dir string, args []string) (string, error) { func RunShortRunCmd(args []string, dir string, envs []string) (string, error) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*20) ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
defer cancel() defer cancel()
cmd := exec.CommandContext(ctx, args[0], args[1:]...) cmd := exec.CommandContext(ctx, args[0], args[1:]...)
cmd.Dir = dir cmd.Dir = dir
cmd.Env = append(os.Environ(), envs...)
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
return string(output), err return string(output), err

6
tests/e2e/e2e_test.go
View File

@ -20,7 +20,7 @@ var _ = Describe("1 [基础测试]", func() {
Expect(err).To(BeNil(), "找不到 sample") Expect(err).To(BeNil(), "找不到 sample")
By("使用 goc build 命令编译") By("使用 goc build 命令编译")
_, err = RunShortRunCmd(dir, []string{"goc", "build", "."}) _, err = RunShortRunCmd([]string{"goc", "build", "."}, dir, nil)
Expect(err).To(BeNil(), "goc build 运行错误") Expect(err).To(BeNil(), "goc build 运行错误")
}) })
}) })
@ -31,12 +31,12 @@ var _ = Describe("1 [基础测试]", func() {
Expect(err).To(BeNil(), "找不到 sample") Expect(err).To(BeNil(), "找不到 sample")
By("启动 goc server") By("启动 goc server")
lc := NewLongRunCmd(dir, []string{"goc", "server", "."}) lc := NewLongRunCmd([]string{"goc", "server", "."}, dir, nil)
lc.Run() lc.Run()
defer lc.Stop() defer lc.Stop()
By("使用 goc list 获取服务列表") By("使用 goc list 获取服务列表")
output, err := RunShortRunCmd(dir, []string{"goc", "list"}) output, err := RunShortRunCmd([]string{"goc", "list"}, dir, nil)
Expect(err).To(BeNil(), "goc list 运行错误") Expect(err).To(BeNil(), "goc list 运行错误")
Expect(output).To(ContainSubstring("REMOTEIP"), "goc list 输出应该包含 REMOTEIP") Expect(output).To(ContainSubstring("REMOTEIP"), "goc list 输出应该包含 REMOTEIP")
}) })