luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fingerprint test should now behave correctly when the executor is not installed; fix some go vet issues

This commit is contained in:
Chris Bednarski 2015-10-06 16:33:02 -07:00
parent 42afc2bfeb
commit 88bb01ab6f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/driver/docker.go
View File

@ -146,7 +146,7 @@ func createContainer(ctx *ExecContext, task *structs.Task, logger *log.Logger) d
for _, port := range network.ListStaticPorts() { for _, port := range network.ListStaticPorts() {
dockerPorts[docker.Port(strconv.Itoa(port)+"/tcp")] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: strconv.Itoa(port)}} dockerPorts[docker.Port(strconv.Itoa(port)+"/tcp")] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: strconv.Itoa(port)}}
dockerPorts[docker.Port(strconv.Itoa(port)+"/udp")] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: strconv.Itoa(port)}} dockerPorts[docker.Port(strconv.Itoa(port)+"/udp")] = []docker.PortBinding{docker.PortBinding{HostIP: network.IP, HostPort: strconv.Itoa(port)}}
logger.Printf("[DEBUG] driver.docker: allocated port %s:%d -> %d (static) %s\n", network.IP, port, port) logger.Printf("[DEBUG] driver.docker: allocated port %s:%d -> %d (static)\n", network.IP, port, port)
} }
for label, port := range network.MapDynamicPorts() { for label, port := range network.MapDynamicPorts() {

10
client/driver/docker_test.go
View File

@ -41,11 +41,11 @@ func TestDockerDriver_Fingerprint(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
if !apply { if apply != dockerLocated() {
t.Fatalf("should apply") t.Fatalf("Fingerprinter should detect Docker when it is installed")
} }
if node.Attributes["driver.docker"] == "" { if node.Attributes["driver.docker"] == "" {
t.Fatalf("Docker not found. The remainder of the docker tests will be skipped.") t.Log("Docker not found. The remainder of the docker tests will be skipped.")
} }
t.Logf("Found docker version %s", node.Attributes["driver.docker.version"]) t.Logf("Found docker version %s", node.Attributes["driver.docker.version"])
} }
@ -217,7 +217,7 @@ func TestDocker_StartN(t *testing.T) {
handles := make([]DriverHandle, len(taskList)) handles := make([]DriverHandle, len(taskList))
t.Log("==> Starting %d tasks", len(taskList)) t.Logf("==> Starting %d tasks", len(taskList))
// Let's spin up a bunch of things // Let's spin up a bunch of things
var err error var err error
@ -266,7 +266,7 @@ func TestDocker_StartNVersions(t *testing.T) {
handles := make([]DriverHandle, len(taskList)) handles := make([]DriverHandle, len(taskList))
t.Log("==> Starting %d tasks", len(taskList)) t.Logf("==> Starting %d tasks", len(taskList))
// Let's spin up a bunch of things // Let's spin up a bunch of things
var err error var err error

4
client/driver/java_test.go
View File

@ -28,8 +28,8 @@ func TestJavaDriver_Fingerprint(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
if !apply { if apply != javaLocated() {
t.Fatalf("should apply") t.Fatalf("Fingerprinter should detect Java when it is installed")
} }
if node.Attributes["driver.java"] != "1" { if node.Attributes["driver.java"] != "1" {
t.Fatalf("missing driver") t.Fatalf("missing driver")