veyron/examples/{mdb,todos}: reenable tests now that the protocol/address config issues are resolved
Change-Id: Ic544181aa5a9d7dde82f16585697a4d5c3ac0a02
diff --git a/examples/mdb/run.sh b/examples/mdb/run.sh
index 89f06fd..9f79996 100755
--- a/examples/mdb/run.sh
+++ b/examples/mdb/run.sh
@@ -28,7 +28,7 @@
# Start the mounttable daemon.
local -r MT_PORT=$("${VEYRON_BIN}/findunusedport")
- "${VEYRON_BIN}/mounttabled" --address=":${MT_PORT}" &
+ "${VEYRON_BIN}/mounttabled" --address="127.0.0.1:${MT_PORT}" &
# Wait for mounttabled to start up.
sleep 1
@@ -37,8 +37,8 @@
export NAMESPACE_ROOT="/127.0.0.1:${MT_PORT}"
# Start the store daemon.
- local -r viewer_port=$("${VEYRON_BIN}/findunusedport")
- "${VEYRON_BIN}/stored" --db="${DB_DIR}" --viewerPort="${viewer_port}" &
+ local -r VIEWER_PORT=$("${VEYRON_BIN}/findunusedport")
+ "${VEYRON_BIN}/stored" --address=127.0.0.1:0 --db="${DB_DIR}" --viewerPort="${VIEWER_PORT}" &
# Wait for stored to start up.
sleep 1
@@ -47,11 +47,11 @@
"${VEYRON_BIN}/mdb_init" --load-all
if [[ -n "${VIEWER_PORT_FILE}" ]]; then
- echo "${viewer_port}" > "${VIEWER_PORT_FILE}"
+ echo "${VIEWER_PORT}" > "${VIEWER_PORT_FILE}"
fi
echo
- echo "Visit http://localhost:${viewer_port} to browse the store."
+ echo "Visit http://localhost:${VIEWER_PORT} to browse the store."
echo "Hit Ctrl-C to kill all running services."
wait
}
diff --git a/examples/mdb/test.sh b/examples/mdb/test.sh
index 3596c5a..8a9f5c9 100755
--- a/examples/mdb/test.sh
+++ b/examples/mdb/test.sh
@@ -8,11 +8,8 @@
source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
main() {
- # TODO(sadovsky): Reenable this test when we can get it to pass on Jenkins.
- shell_test::pass
-
cd "${REPO_ROOT}/go/src/veyron/examples/mdb"
- make build || shell_test::fail "line ${LINENO}: failed to build"
+ make build &>/dev/null || shell_test::fail "line ${LINENO}: failed to build"
local -r VIEWER_PORT_FILE="${TMPDIR}/viewer_port.txt"
./run.sh "${VIEWER_PORT_FILE}" &>/dev/null &
@@ -21,10 +18,11 @@
if [ ! -f "${VIEWER_PORT_FILE}" ]; then
shell_test::fail "line ${LINENO}: failed to get viewer url"
fi
- local VIEWER_PORT=$(cat "${VIEWER_PORT_FILE}")
+ local -r VIEWER_PORT=$(cat "${VIEWER_PORT_FILE}")
local -r HTML_FILE="${TMPDIR}/index.html"
- curl 2>/dev/null "http://127.0.0.1:${VIEWER_PORT}" -o "${HTML_FILE}" || shell_test::fail "line ${LINENO}: failed to fetch http://127.0.0.1:${VIEWER_PORT}"
+ local -r URL="http://127.0.0.1:${VIEWER_PORT}"
+ curl 2>/dev/null "${URL}" -o "${HTML_FILE}" || shell_test::fail "line ${LINENO}: failed to fetch ${URL}"
if grep -q "moviesbox" "${HTML_FILE}"; then
shell_test::pass
diff --git a/examples/todos/run.sh b/examples/todos/run.sh
index 224937f..4ff51b4 100755
--- a/examples/todos/run.sh
+++ b/examples/todos/run.sh
@@ -28,7 +28,7 @@
# Start the mounttable daemon.
local -r MT_PORT=$("${VEYRON_BIN}/findunusedport")
- "${VEYRON_BIN}/mounttabled" --address=":${MT_PORT}" &
+ "${VEYRON_BIN}/mounttabled" --address="127.0.0.1:${MT_PORT}" &
# Wait for mounttabled to start up.
sleep 1
@@ -38,7 +38,7 @@
# Start the store daemon.
local -r VIEWER_PORT=$("${VEYRON_BIN}/findunusedport")
- "${VEYRON_BIN}/stored" --db="${DB_DIR}" --viewerPort="${VIEWER_PORT}" &
+ "${VEYRON_BIN}/stored" --address=127.0.0.1:0 --db="${DB_DIR}" --viewerPort="${VIEWER_PORT}" &
# Wait for stored to start up.
sleep 1
@@ -56,4 +56,4 @@
wait
}
-main() "$@"
+main "$@"
diff --git a/examples/todos/test.sh b/examples/todos/test.sh
index 956a2e8..8eafb44 100755
--- a/examples/todos/test.sh
+++ b/examples/todos/test.sh
@@ -8,11 +8,8 @@
source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
main() {
- # TODO(sadovsky): Reenable this test when we can get it to pass on Jenkins.
- shell_test::pass
-
cd "${REPO_ROOT}/go/src/veyron/examples/todos"
- make build || shell_test::fail "line ${LINENO}: failed to build"
+ make buildgo &>/dev/null || shell_test::fail "line ${LINENO}: failed to build"
local -r VIEWER_PORT_FILE="${TMPDIR}/viewer_port.txt"
./run.sh "${VIEWER_PORT_FILE}" &>/dev/null &
@@ -21,10 +18,11 @@
if [ ! -f "${VIEWER_PORT_FILE}" ]; then
shell_test::fail "line ${LINENO}: failed to get viewer url"
fi
-
local -r VIEWER_PORT=$(cat "${VIEWER_PORT_FILE}")
+
local -r HTML_FILE="${TMPDIR}/index.html"
- curl 2>/dev/null "http://127.0.0.1:${VIEWER_PORT}" -o "${HTML_FILE}" || fail "line ${LINENO}: failed to fetch http://127.0.0.1:${VIEWER_PORT}"
+ local -r URL="http://127.0.0.1:${VIEWER_PORT}"
+ curl 2>/dev/null "${URL}" -o "${HTML_FILE}" || shell_test::fail "line ${LINENO}: failed to fetch ${URL}"
if grep -q "/lists" "${HTML_FILE}"; then
shell_test::pass
