Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ipfs/kubo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7fbfecf6fab5
Choose a base ref
...
head repository: ipfs/kubo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 18297e2dc936
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 3, 2015

  1. Copy the full SHA
    9bdc1d6 View commit details
  2. Merge pull request #1326 from rht/master

    Test repeat in 10 sec: increase check frequency tenfold
    jbenet committed Jun 3, 2015
    Copy the full SHA
    18297e2 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 test/sharness/lib/test-lib.sh
8 changes: 4 additions & 4 deletions test/sharness/lib/test-lib.sh
Original file line number Diff line number Diff line change
@@ -52,10 +52,10 @@ fi
. ../../ipfs-test-lib.sh

test_cmp_repeat_10_sec() {
for i in 1 2 3 4 5 6 7 8 9 10
for i in `seq 1 100`
do
test_cmp "$1" "$2" >/dev/null && return
sleep 1
sleep 0.1
done
test_cmp "$1" "$2"
}
@@ -245,9 +245,9 @@ test_launch_ipfs_daemon_and_mount() {
test_kill_repeat_10_sec() {
# try to shut down once + wait for graceful exit
kill $1
for i in 1 2 3 4 5 6 7 8 9 10
for i in `seq 1 100`
do
sleep 1
sleep 0.1
! kill -0 $1 2>/dev/null && return
done