-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2521 from hashicorp/t-windows
Variety of Windows specific test fixes
- Loading branch information
Showing
12 changed files
with
460 additions
and
401 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| // +build !windows | ||
|
|
||
| package driver | ||
|
|
||
| import ( | ||
| "io/ioutil" | ||
| "path/filepath" | ||
| "strings" | ||
| "syscall" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/hashicorp/nomad/client/testutil" | ||
| "github.com/hashicorp/nomad/nomad/structs" | ||
| tu "github.com/hashicorp/nomad/testutil" | ||
| ) | ||
|
|
||
| func TestDockerDriver_Signal(t *testing.T) { | ||
| if !testutil.DockerIsConnected(t) { | ||
| t.SkipNow() | ||
| } | ||
|
|
||
| task := &structs.Task{ | ||
| Name: "redis-demo", | ||
| Driver: "docker", | ||
| Config: map[string]interface{}{ | ||
| "image": "busybox", | ||
| "load": "busybox.tar", | ||
| "command": "/bin/sh", | ||
| "args": []string{"local/test.sh"}, | ||
| }, | ||
| Resources: &structs.Resources{ | ||
| MemoryMB: 256, | ||
| CPU: 512, | ||
| }, | ||
| LogConfig: &structs.LogConfig{ | ||
| MaxFiles: 10, | ||
| MaxFileSizeMB: 10, | ||
| }, | ||
| } | ||
|
|
||
| ctx := testDockerDriverContexts(t, task) | ||
| //ctx.DriverCtx.config.Options = map[string]string{"docker.cleanup.image": "false"} | ||
| defer ctx.AllocDir.Destroy() | ||
| d := NewDockerDriver(ctx.DriverCtx) | ||
|
|
||
| // Copy the image into the task's directory | ||
| copyImage(t, ctx.ExecCtx.TaskDir, "busybox.tar") | ||
|
|
||
| testFile := filepath.Join(ctx.ExecCtx.TaskDir.LocalDir, "test.sh") | ||
| testData := []byte(` | ||
| at_term() { | ||
| echo 'Terminated.' | ||
| exit 3 | ||
| } | ||
| trap at_term USR1 | ||
| while true; do | ||
| sleep 1 | ||
| done | ||
| `) | ||
| if err := ioutil.WriteFile(testFile, testData, 0777); err != nil { | ||
| t.Fatalf("Failed to write data: %v", err) | ||
| } | ||
|
|
||
| _, err := d.Prestart(ctx.ExecCtx, task) | ||
| if err != nil { | ||
| t.Fatalf("error in prestart: %v", err) | ||
| } | ||
| handle, err := d.Start(ctx.ExecCtx, task) | ||
| if err != nil { | ||
| t.Fatalf("err: %v", err) | ||
| } | ||
| if handle == nil { | ||
| t.Fatalf("missing handle") | ||
| } | ||
| defer handle.Kill() | ||
|
|
||
| waitForExist(t, handle.(*DockerHandle).client, handle.(*DockerHandle)) | ||
|
|
||
| time.Sleep(1 * time.Second) | ||
| if err := handle.Signal(syscall.SIGUSR1); err != nil { | ||
| t.Fatalf("Signal returned an error: %v", err) | ||
| } | ||
|
|
||
| select { | ||
| case res := <-handle.WaitCh(): | ||
| if res.Successful() { | ||
| t.Fatalf("should err: %v", res) | ||
| } | ||
| case <-time.After(time.Duration(tu.TestMultiplier()*5) * time.Second): | ||
| t.Fatalf("timeout") | ||
| } | ||
|
|
||
| // Check the log file to see it exited because of the signal | ||
| outputFile := filepath.Join(ctx.ExecCtx.TaskDir.LogDir, "redis-demo.stdout.0") | ||
| act, err := ioutil.ReadFile(outputFile) | ||
| if err != nil { | ||
| t.Fatalf("Couldn't read expected output: %v", err) | ||
| } | ||
|
|
||
| exp := "Terminated." | ||
| if strings.TrimSpace(string(act)) != exp { | ||
| t.Fatalf("Command outputted %v; want %v", act, exp) | ||
| } | ||
| } |
Oops, something went wrong.