Add extra test for weave client.

common/weave/client_test.go

@@ -150,3 +150,47 @@ func TestPS(t *testing.T) {
 		t.Fatal(test.Diff(entries, want))
 	}
 }
+
+func TestExpose(t *testing.T) {
+	oldExecCmd := exec.Command
+	defer func() { exec.Command = oldExecCmd }()
+
+	psCalled := false
+	exec.Command = func(name string, args ...string) exec.Cmd {
+		if args[0] == "expose" {
+			t.Fatal("Expose not expected")
+			return nil
+		} else {
+			psCalled = true
+			return testExec.NewMockCmdString(fmt.Sprintf("%s %s %s/24\n", mockContainerID, mockContainerMAC, mockContainerIP))
+		}
+	}
+
+	client := weave.NewClient("")
+	if err := client.Expose(); err != nil {
+		t.Fatal(err)
+	}
+
+	if !psCalled {
+		t.Fatal("Expected a call to weave ps")
+	}
+
+	psCalled, exposeCalled := false, false
+	exec.Command = func(name string, args ...string) exec.Cmd {
+		if args[0] == "expose" {
+			exposeCalled = true
+			return testExec.NewMockCmdString("")
+		} else {
+			psCalled = true
+			return testExec.NewMockCmdString("")
+		}
+	}
+
+	if err := client.Expose(); err != nil {
+		t.Fatal(err)
+	}
+
+	if !psCalled || !exposeCalled {
+		t.Fatal("Expected a call to weave ps & expose")
+	}
+}