drivers/raw_exec: added unix specific tests

drivers/raw_exec/driver.go

@@ -246,13 +246,14 @@ func (r *RawExecDriver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle,
 	}
 
 	execCmd := &executor.ExecCommand{
-		Cmd:  driverConfig.Command,
-		Args: driverConfig.Args,
-		Env:  cfg.EnvList(),
-		User: cfg.User,
-		//TaskKillSignal:     os.Interrupt,
+		Cmd:                driverConfig.Command,
+		Args:               driverConfig.Args,
+		Env:                cfg.EnvList(),
+		User:               cfg.User,
 		BasicProcessCgroup: !r.config.NoCgroups,
 		TaskDir:            cfg.TaskDir().Dir,
+		StdoutPath:         cfg.StdoutPath,
+		StderrPath:         cfg.StderrPath,
 	}
 
 	ps, err := exec.Launch(execCmd)
@@ -371,12 +372,12 @@ func (r *RawExecDriver) InspectTask(taskID string) (*drivers.TaskStatus, error)
 	}
 
 	status := &drivers.TaskStatus{
-		ID:           handle.task.ID,
-		Name:         handle.task.Name,
-		State:        handle.procState,
-		StartedAt:    handle.startedAt,
-		CompletedAt:  handle.completedAt,
-		ExitResult:   handle.exitResult,
+		ID:          handle.task.ID,
+		Name:        handle.task.Name,
+		State:       handle.procState,
+		StartedAt:   handle.startedAt,
+		CompletedAt: handle.completedAt,
+		ExitResult:  handle.exitResult,
 		DriverAttributes: map[string]string{
 			"pid": strconv.Itoa(handle.pid),
 		},

drivers/raw_exec/driver_unix_test.go

@@ -0,0 +1,125 @@
+// +build !windows
+
+package raw_exec
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/hashicorp/nomad/helper/testlog"
+	"github.com/hashicorp/nomad/helper/testtask"
+	"github.com/hashicorp/nomad/helper/uuid"
+	"github.com/hashicorp/nomad/plugins/drivers"
+	"github.com/hashicorp/nomad/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestRawExecDriver_User(t *testing.T) {
+	t.Parallel()
+	if runtime.GOOS != "linux" {
+		t.Skip("Linux only test")
+	}
+	require := require.New(t)
+
+	d := NewRawExecDriver(testlog.HCLogger(t))
+	harness := drivers.NewDriverHarness(t, d)
+
+	task := &drivers.TaskConfig{
+		ID:   uuid.Generate(),
+		Name: "sleep",
+		User: "alice",
+	}
+
+	cleanup := harness.MkAllocDir(task, false)
+	defer cleanup()
+
+	task.EncodeDriverConfig(&TaskConfig{
+		Command: testtask.Path(),
+		Args:    []string{"sleep", "45s"},
+	})
+
+	testtask.SetTaskConfigEnv(task)
+	_, err := harness.StartTask(task)
+	require.Error(err)
+	msg := "unknown user alice"
+	require.Contains(err.Error(), msg)
+}
+
+func TestRawExecDriver_Signal(t *testing.T) {
+	t.Parallel()
+	if runtime.GOOS != "linux" {
+		t.Skip("Linux only test")
+	}
+	require := require.New(t)
+
+	d := NewRawExecDriver(testlog.HCLogger(t))
+	harness := drivers.NewDriverHarness(t, d)
+
+	task := &drivers.TaskConfig{
+		ID:   uuid.Generate(),
+		Name: "signal",
+	}
+
+	cleanup := harness.MkAllocDir(task, true)
+	defer cleanup()
+
+	task.EncodeDriverConfig(&TaskConfig{
+		Command: "/bin/bash",
+		Args:    []string{"test.sh"},
+	})
+
+	testFile := filepath.Join(task.TaskDir().Dir, "test.sh")
+	testData := []byte(`
+at_term() {
+    echo 'Terminated.'
+    exit 3
+}
+trap at_term USR1
+while true; do
+    sleep 1
+done
+	`)
+	require.NoError(ioutil.WriteFile(testFile, testData, 0777))
+
+	testtask.SetTaskConfigEnv(task)
+	_, err := harness.StartTask(task)
+	require.NoError(err)
+
+	go func() {
+		time.Sleep(100 * time.Millisecond)
+		require.NoError(harness.SignalTask(task.ID, "SIGUSR1"))
+	}()
+
+	// Task should terminate quickly
+	waitCh, err := harness.WaitTask(context.Background(), task.ID)
+	require.NoError(err)
+	select {
+	case res := <-waitCh:
+		require.False(res.Successful())
+		require.Equal(3, res.ExitCode)
+	case <-time.After(time.Duration(testutil.TestMultiplier()*6) * time.Second):
+		require.Fail("WaitTask timeout")
+	}
+
+	// Check the log file to see it exited because of the signal
+	outputFile := filepath.Join(task.TaskDir().LogDir, "signal.stdout.0")
+	exp := "Terminated."
+	testutil.WaitForResult(func() (bool, error) {
+		act, err := ioutil.ReadFile(outputFile)
+		if err != nil {
+			return false, fmt.Errorf("Couldn't read expected output: %v", err)
+		}
+
+		if strings.TrimSpace(string(act)) != exp {
+			t.Logf("Read from %v", outputFile)
+			return false, fmt.Errorf("Command outputted %v; want %v", act, exp)
+		}
+		return true, nil
+	}, func(err error) { require.NoError(err) })
+}