From f3ab25a512806708dc2eb6b99d8a38795bd98794 Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Mon, 20 Apr 2015 14:35:18 +0100
Subject: [PATCH] Remove unnecessary -i flag from docker exec invocations.

Fixes #579.
---
 test/100_cross_hosts_test.sh   | 2 +-
 test/110_encryption_test.sh    | 2 +-
 test/200_dns_test.sh           | 4 ++--
 test/210_dns_multicast_test.sh | 6 +++---
 test/220_dns_custom_test.sh    | 4 ++--
 test/300_fallback_dns_test.sh  | 4 ++--
 test/400_weave_local_test.sh   | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/100_cross_hosts_test.sh b/test/100_cross_hosts_test.sh
index 7d95a519..ec1b1bd9 100755
--- a/test/100_cross_hosts_test.sh
+++ b/test/100_cross_hosts_test.sh
@@ -18,7 +18,7 @@ weave_on $HOST2 launch $HOST1
 
 weave_on $HOST2 run $C2/24 -t --name=c2 ubuntu
 weave_on $HOST1 run $C1/24 -t --name=c1 ubuntu
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 sh -c "ping -q -c 4 $C2 >&2 && echo ok")
+ok=$(docker -H tcp://$HOST1:2375 exec c1 sh -c "ping -q -c 4 $C2 >&2 && echo ok")
 assert "echo $ok" "ok"
 
 end_suite
diff --git a/test/110_encryption_test.sh b/test/110_encryption_test.sh
index ecf1f857..a70d4f37 100755
--- a/test/110_encryption_test.sh
+++ b/test/110_encryption_test.sh
@@ -18,7 +18,7 @@ weave_on $HOST2 launch -password notverysecure $HOST1
 
 weave_on $HOST2 run $C2/24 -t --name=c2 ubuntu
 weave_on $HOST1 run $C1/24 -t --name=c1 ubuntu
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 sh -c "ping -q -c 4 $C2 >&2 && echo ok")
+ok=$(docker -H tcp://$HOST1:2375 exec c1 sh -c "ping -q -c 4 $C2 >&2 && echo ok")
 assert "echo $ok" "ok"
 
 end_suite
diff --git a/test/200_dns_test.sh b/test/200_dns_test.sh
index a05ced4e..d38dba84 100755
--- a/test/200_dns_test.sh
+++ b/test/200_dns_test.sh
@@ -16,10 +16,10 @@ docker_on $HOST1 rm -f c1 c2 || true
 weave_on $HOST1 run $C2/24 -t --name=c2 -h seetwo.weave.local ubuntu
 weave_on $HOST1 run --with-dns $C1/24 -t --name=c1 aanand/docker-dnsutils /bin/sh
 
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 sh -c "dig +short seetwo.weave.local")
+ok=$(docker -H tcp://$HOST1:2375 exec c1 sh -c "dig +short seetwo.weave.local")
 assert "echo $ok" "$C2"
 
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 sh -c "dig +short -x $C2")
+ok=$(docker -H tcp://$HOST1:2375 exec c1 sh -c "dig +short -x $C2")
 assert "echo $ok" "seetwo.weave.local."
 
 end_suite
diff --git a/test/210_dns_multicast_test.sh b/test/210_dns_multicast_test.sh
index ef720f73..a296f276 100755
--- a/test/210_dns_multicast_test.sh
+++ b/test/210_dns_multicast_test.sh
@@ -22,13 +22,13 @@ weave_on $HOST2 launch-dns 10.2.254.2/24 -debug
 weave_on $HOST2 run $C2/24 -t --name=c2 -h seetwo.weave.local ubuntu
 weave_on $HOST1 run --with-dns $C1/24 --name=c1 -t aanand/docker-dnsutils /bin/sh
 
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 dig +short seetwo.weave.local)
+ok=$(docker -H tcp://$HOST1:2375 exec c1 dig +short seetwo.weave.local)
 assert "echo $ok" "$C2"
 
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 dig +short -x $C2)
+ok=$(docker -H tcp://$HOST1:2375 exec c1 dig +short -x $C2)
 assert "echo $ok" "seetwo.weave.local."
 
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 dig +short -x 8.8.8.8)
+ok=$(docker -H tcp://$HOST1:2375 exec c1 dig +short -x 8.8.8.8)
 assert "test -n \"$ok\" && echo pass" "pass"
 
 end_suite
diff --git a/test/220_dns_custom_test.sh b/test/220_dns_custom_test.sh
index 835ebd98..7a73eaaa 100755
--- a/test/220_dns_custom_test.sh
+++ b/test/220_dns_custom_test.sh
@@ -16,10 +16,10 @@ docker_on $HOST1 rm -f c1 c2 || true
 weave_on $HOST1 run $C2/24 -t --name=c2 -h seetwo.foo.bar ubuntu
 weave_on $HOST1 run --with-dns $C1/24 -t --name=c1 aanand/docker-dnsutils /bin/sh
 
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 sh -c "dig +short seetwo.foo.bar.")
+ok=$(docker -H tcp://$HOST1:2375 exec c1 sh -c "dig +short seetwo.foo.bar.")
 assert "echo $ok" "$C2"
 
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 sh -c "dig +short -x $C2")
+ok=$(docker -H tcp://$HOST1:2375 exec c1 sh -c "dig +short -x $C2")
 assert "echo $ok" "seetwo.foo.bar."
 
 end_suite
diff --git a/test/300_fallback_dns_test.sh b/test/300_fallback_dns_test.sh
index 49131c59..94e3a5b0 100755
--- a/test/300_fallback_dns_test.sh
+++ b/test/300_fallback_dns_test.sh
@@ -10,10 +10,10 @@ docker_on $HOST1 rm -f c1 || true
 
 weave_on $HOST1 run --with-dns 10.2.1.5/24 --name=c1 -t aanand/docker-dnsutils /bin/sh
 
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 dig +short -t MX weave.works)
+ok=$(docker -H tcp://$HOST1:2375 exec c1 dig +short -t MX weave.works)
 assert "test -n \"$ok\" && echo pass" "pass"
 
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 dig +short -x 8.8.8.8)
+ok=$(docker -H tcp://$HOST1:2375 exec c1 dig +short -x 8.8.8.8)
 assert "test -n \"$ok\" && echo pass" "pass"
 
 end_suite
diff --git a/test/400_weave_local_test.sh b/test/400_weave_local_test.sh
index 52fcb741..f8ce663e 100755
--- a/test/400_weave_local_test.sh
+++ b/test/400_weave_local_test.sh
@@ -11,7 +11,7 @@ assert_raises "docker_on $HOST1 ps | grep weave" 0
 
 docker_on $HOST1 rm -f c1 || true
 run_on $HOST1 sudo ./weave --local run 10.2.6.5/24 -ti --name=c1 ubuntu
-ok=$(docker -H tcp://$HOST1:2375 exec -i c1 sh -c "ifconfig | grep ethwe")
+ok=$(docker -H tcp://$HOST1:2375 exec c1 sh -c "ifconfig | grep ethwe")
 assert "test -n \"$ok\" && echo pass" "pass"
 
 docker_on $HOST1 rm -f c1 || true