From e0a6751890271e073f756cabdf1b9bcdb068712e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 16:04:34 +0100 Subject: unfix all the docker tests, sorry :( --- ship/src/refresh-supers | 2 ++ ship/t/docker/docker_remote_punani.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'ship') diff --git a/ship/src/refresh-supers b/ship/src/refresh-supers index a35e2229..6dc6e8ab 100644 --- a/ship/src/refresh-supers +++ b/ship/src/refresh-supers @@ -22,6 +22,8 @@ defer "rm -f $tmp_tincconf" sed '/^[ ]*ConnectTo/d' "$tincconf" > "$tmp_tincconf" + +# TODO find_supernodes requires netcat find_supernodes | cut -d\ -f 1 | shuf \ | head -n "${max_connect_to}" \ | xargs -n1 printf "ConnectTo=%s\n" >> "$tmp_tincconf" diff --git a/ship/t/docker/docker_remote_punani.sh b/ship/t/docker/docker_remote_punani.sh index c006f013..1eab1a42 100755 --- a/ship/t/docker/docker_remote_punani.sh +++ b/ship/t/docker/docker_remote_punani.sh @@ -1,5 +1,5 @@ #!/bin/sh cd $(dirname $(readlink -f $0)) -docker_id=$(docker run -rm=true -d -v $PWD/punani/:/test ubuntu /bin/sh /test/remote_punani) +docker_id=$(docker run -d -v $PWD/punani/:/test ubuntu /bin/sh /test/remote_punani) trap "docker rm $docker_id" INT TERM EXIT QUIT docker wait $docker_id -- cgit v1.2.3