commit c7cdf42962a7fdde4f2d94275ea79b8aab1cf3f4
author Nicolas LaCasse <nlacasse@google.com> Thu Jan 08 14:11:29 2015 -0800
committer Nicolas LaCasse <nlacasse@google.com> Thu Jan 08 14:11:31 2015 -0800
tree f024be057d8a05ab5de5f989b57d36b9801c1dc9
parent 4d32541f32727ad121252550180be83271a42b04

veyron/lib/modules, veyron/tools/servicerunner: Start the test identityd
server in the servicerunner.

This CL adds a new module "test_identityd" for running the test identityd
server.

The servicerunner now starts the test identityd server.

Small cleanups to the servicerunner and wspr modules.

Change-Id: Ic066eefce3061541b98ddad914c1798248aa1f55

tools/servicerunner/main.go

diff --git a/tools/servicerunner/main.go b/tools/servicerunner/main.go
index edbc8ff..e615c2d 100644
--- a/tools/servicerunner/main.go
+++ b/tools/servicerunner/main.go
@@ -14,7 +14,7 @@
 	"v.io/core/veyron/lib/expect"
 	"v.io/core/veyron/lib/flags/consts"
 	"v.io/core/veyron/lib/modules"
-	_ "v.io/core/veyron/lib/modules/core"
+	"v.io/core/veyron/lib/modules/core"
 	_ "v.io/core/veyron/profiles"
 )
 
@@ -79,9 +79,9 @@
 	}
 	vars[consts.VeyronCredentials] = v
 
-	h, err := sh.Start("root", nil, "--", "--veyron.tcp.protocol=ws", "--veyron.tcp.address=127.0.0.1:0")
+	h, err := sh.Start(core.RootMTCommand, nil, "--", "--veyron.tcp.protocol=ws", "--veyron.tcp.address=127.0.0.1:0")
 	panicOnError(err)
-	updateVars(h, vars, "MT_NAME")
+	panicOnError(updateVars(h, vars, "MT_NAME"))
 
 	// Set consts.NamespaceRootPrefix env var, consumed downstream by proxyd
 	// among others.
@@ -91,13 +91,17 @@
 
 	// NOTE(sadovsky): The proxyd binary requires --protocol and --address flags
 	// while the proxyd command instead uses ListenSpec flags.
-	h, err = sh.Start("proxyd", nil, "--", "--veyron.tcp.protocol=ws", "--veyron.tcp.address=127.0.0.1:0", "test/proxy")
+	h, err = sh.Start(core.ProxyServerCommand, nil, "--", "--veyron.tcp.protocol=ws", "--veyron.tcp.address=127.0.0.1:0", "test/proxy")
 	panicOnError(err)
-	updateVars(h, vars, "PROXY_ADDR")
+	panicOnError(updateVars(h, vars, "PROXY_ADDR"))
 
-	h, err = sh.Start("wsprd", nil, "--", "--veyron.tcp.protocol=ws", "--veyron.tcp.address=127.0.0.1:0", "--veyron.proxy=test/proxy", "--identd=test/identd")
+	h, err = sh.Start(core.WSPRCommand, nil, "--", "--veyron.tcp.protocol=ws", "--veyron.tcp.address=127.0.0.1:0", "--veyron.proxy=test/proxy", "--identd=test/identd")
 	panicOnError(err)
-	updateVars(h, vars, "WSPR_ADDR")
+	panicOnError(updateVars(h, vars, "WSPR_ADDR"))
+
+	h, err = sh.Start(core.TestIdentitydCommand, nil, "--", "--veyron.tcp.protocol=ws", "--veyron.tcp.address=127.0.0.1:0", "--veyron.proxy=test/proxy", "--host=localhost", "--httpaddr=localhost:0")
+	panicOnError(err)
+	panicOnError(updateVars(h, vars, "TEST_IDENTITYD_ADDR", "TEST_IDENTITYD_HTTP_ADDR"))
 
 	bytes, err := json.Marshal(vars)
 	panicOnError(err)

tools/servicerunner/servicerunner_test.go

diff --git a/tools/servicerunner/servicerunner_test.go b/tools/servicerunner/servicerunner_test.go
index 5a7b24f..57cd8f7 100644
--- a/tools/servicerunner/servicerunner_test.go
+++ b/tools/servicerunner/servicerunner_test.go
@@ -39,7 +39,15 @@
 	vars := map[string]string{}
 	check(t, json.Unmarshal(line, &vars))
 	fmt.Println(vars)
-	for _, name := range []string{"VEYRON_CREDENTIALS", "MT_NAME", "PROXY_ADDR", "WSPR_ADDR"} {
+	expectedVars := []string{
+		"VEYRON_CREDENTIALS",
+		"MT_NAME",
+		"PROXY_ADDR",
+		"WSPR_ADDR",
+		"TEST_IDENTITYD_ADDR",
+		"TEST_IDENTITYD_HTTP_ADDR",
+	}
+	for _, name := range expectedVars {
 		if _, ok := vars[name]; !ok {
 			t.Error("Missing", name)
 		}