kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

executor: fix failing stats related test

Browse Source
This commit is contained in:
Nick Ethier
2019-01-10 14:20:18 -05:00
parent f6af1d4d04
commit 9904463da2
7 changed files with 72 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/shared/executor/executor_test.go
View File

@@ -78,6 +78,8 @@ func TestExecutor_Start_Invalid(pt *testing.T) {
pt.Parallel()
invalid := "/bin/foobar"
for name, factory := range executorFactories {
name := name
factory := factory
pt.Run(name, func(t *testing.T) {
require := require.New(t)
execCmd, allocDir := testExecutorCommand(t)
@@ -96,6 +98,8 @@ func TestExecutor_Start_Invalid(pt *testing.T) {
func TestExecutor_Start_Wait_Failure_Code(pt *testing.T) {
pt.Parallel()
for name, factory := range executorFactories {
name := name
factory := factory
pt.Run(name, func(t *testing.T) {
require := require.New(t)
execCmd, allocDir := testExecutorCommand(t)
@@ -118,6 +122,8 @@ func TestExecutor_Start_Wait_Failure_Code(pt *testing.T) {
func TestExecutor_Start_Wait(pt *testing.T) {
pt.Parallel()
for name, factory := range executorFactories {
name := name
factory := factory
pt.Run(name, func(t *testing.T) {
require := require.New(t)
execCmd, allocDir := testExecutorCommand(t)
@@ -155,6 +161,8 @@ func TestExecutor_Start_Wait(pt *testing.T) {
func TestExecutor_WaitExitSignal(pt *testing.T) {
pt.Parallel()
for name, factory := range executorFactories {
name := name
factory := factory
pt.Run(name, func(t *testing.T) {
require := require.New(t)
execCmd, allocDir := testExecutorCommand(t)
@@ -170,18 +178,32 @@ func TestExecutor_WaitExitSignal(pt *testing.T) {
go func() {
// Give process time to start
time.Sleep(time.Second)
ch, err := executor.Stats(context.Background(), time.Second)
assert.NoError(t, err)
select {
case <-time.After(time.Second):
assert.Fail(t, "stats failed to send on interval")
case ru := <-ch:
assert.NotEmpty(t, ru.Pids)
}
proc, err := os.FindProcess(ps.Pid)
assert.NoError(t, err)
err = proc.Signal(syscall.SIGKILL)
assert.NoError(t, err)
tu.WaitForResult(func() (bool, error) {
ch, err := executor.Stats(context.Background(), time.Second)
if err != nil {
return false, err
}
select {
case <-time.After(time.Second):
return false, fmt.Errorf("stats failed to send on interval")
case ru := <-ch:
if len(ru.Pids) == 0 {
return false, fmt.Errorf("no pids recorded in stats")
}
}
proc, err := os.FindProcess(ps.Pid)
if err != nil {
return false, err
}
err = proc.Signal(syscall.SIGKILL)
if err != nil {
return false, err
}
return true, nil
}, func(err error) {
assert.NoError(t, err)
executor.Shutdown("SIGINT", 0)
})
}()
ps, err = executor.Wait(context.Background())
@@ -194,6 +216,8 @@ func TestExecutor_WaitExitSignal(pt *testing.T) {
func TestExecutor_Start_Kill(pt *testing.T) {
pt.Parallel()
for name, factory := range executorFactories {
name := name
factory := factory
pt.Run(name, func(t *testing.T) {
require := require.New(t)
execCmd, allocDir := testExecutorCommand(t)
@@ -296,7 +320,7 @@ func TestUniversalExecutor_LookupPath(t *testing.T) {
// than mounting the underlying host filesystem
func setupRootfs(t *testing.T, rootfs string) {
paths := []string{
"/bin/sh",
// "/bin/sh",
"/bin/sleep",
"/bin/echo",
"/bin/date",