Merge pull request weaveworks#2136 from weaveworks/bump-tools

Bump tools subtree and fix integration tests

integration/100_launch_test.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # shellcheck disable=SC1091
-./config.sh
+. ./config.sh
 
 start_suite "Launch scope and check it boots"
 

integration/config.sh

@@ -71,8 +71,8 @@ has_connection_by_id() {
     for i in $(seq "$timeout"); do
         local nodes
         local edge
-        edge=$(echo "$nodes" | jq -r ".nodes[\"$from_id\"].adjacency | contains([\"$to_id\"])" 2>/dev/null)
-        nodes="$(curl -s "http://$host:4040/api/topology/${view}?system=show")"
+        edge=$(echo "$nodes" | (jq -r ".nodes[\"$from_id\"].adjacency | contains([\"$to_id\"])" || true) 2>/dev/null)
+        nodes=$(curl -s "http://$host:4040/api/topology/${view}?system=show" || true)
         if [ "$edge" = "true" ]; then
             echo "Found edge $from -> $to after $i secs"
             assert "curl -s http://$host:4040/api/topology/${view}?system=show |  jq -r '.nodes[\"$from_id\"].adjacency | contains([\"$to_id\"])'" true
@@ -109,7 +109,7 @@ wait_for() {
     for i in $(seq "${timeout}"); do
         local nodes
         local found=0
-        nodes="$(curl -s "http://$host:4040/api/topology/${view}?system=show")"
+        nodes=$(curl -s "http://$host:4040/api/topology/${view}?system=show" || true)
         for name in "$@"; do
             local count
             count=$(echo "${nodes}" | jq -r "[.nodes[] | select(.label == \"${name}\")] | length")

tools/.gitignore

@@ -2,6 +2,5 @@ cover/cover
 socks/proxy
 socks/image.tar
 runner/runner
-cmd/wcloud/wcloud
 *.pyc
 *~

tools/circle.yml

@@ -27,5 +27,4 @@ test:
     - cd $SRCDIR/cover; make
     - cd $SRCDIR/socks; make
     - cd $SRCDIR/runner; make
-    - cd $SRCDIR/cmd/wcloud; make