Revert "wait for the nodes to fully stop"

WIP: making sure this is actually the issue. This reverts commit 202cedd.
ipfs · Jul 30, 2018 · 429b3c4 · 429b3c4 · GitCop · Jul 30, 2018
1 parent a920136
commit 429b3c4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/test/sharness/lib/iptb-lib.sh b/test/sharness/lib/iptb-lib.sh
@@ -56,9 +56,3 @@ startup_cluster() {
     '
   done
 }
-
-iptb_wait_stop() {
-    while ! iptb for-each sh -c '! { test -e "$IPFS_PATH/repo.lock" && fuser -f "$IPFS_PATH/repo.lock" >/dev/null; }'; do
-        go-sleep 10ms
-    done
-}
diff --git a/test/sharness/t0125-twonode.sh b/test/sharness/t0125-twonode.sh
@@ -81,7 +81,7 @@ run_advanced_test() {
   '
 
   test_expect_success "shut down nodes" '
-    iptb stop && iptb_wait_stop
+    iptb stop
   '
 }
 

diff --git a/test/sharness/t0130-multinode.sh b/test/sharness/t0130-multinode.sh
@@ -67,7 +67,7 @@ run_basic_test() {
   run_single_file_test
 
   test_expect_success "shut down nodes" '
-    iptb stop && iptb_wait_stop
+    iptb stop
   '
 }
 
@@ -79,7 +79,7 @@ run_advanced_test() {
   run_random_dir_test
 
   test_expect_success "shut down nodes" '
-    iptb stop && iptb_wait_stop ||
+    iptb stop ||
       test_fsh tail -n +1 .iptb/*/daemon.std*
   '
 }

diff --git a/test/sharness/t0182-circuit-relay.sh b/test/sharness/t0182-circuit-relay.sh
@@ -21,7 +21,6 @@ test_expect_success 'configure EnableRelayHop in relay node' '
 
 test_expect_success 'restart nodes' '
   iptb stop &&
-  iptb_wait_stop &&
   iptb start --args --routing=none
 '
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,7 @@ run_advanced_test() { @@
       '
       test_expect_success "shut down nodes" '
-        iptb stop && iptb_wait_stop
+        iptb stop
       '
     }
@@ Expand Down @@