commit 7e1ed835ae7c011cc3b94075dc607af8a4ad11f7
author Adam Sadovsky <sadovsky@google.com> Wed Aug 13 13:53:54 2014 -0700
committer Adam Sadovsky <sadovsky@google.com> Wed Aug 13 13:53:56 2014 -0700
tree 1539914efb44120d3588e070caadc0d4730b0c49
parent 785882f21bcb6bd3595d7efe2d707fe4cb5cbee8

veyron/examples/{mdb,todos}: reenable tests now that the protocol/address config issues are resolved

Change-Id: Ic544181aa5a9d7dde82f16585697a4d5c3ac0a02

examples/todos/test.sh

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