From 8b875ebe770c3093496b5a58f6003809f6fd64e9 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 1 Feb 2016 13:35:54 +0100 Subject: [PATCH] t0121, t0130, t0240: use iptb-lib.sh License: MIT Signed-off-by: Christian Couder --- test/sharness/t0121-bootstrap-iptb.sh | 13 ------------- test/sharness/t0130-multinode.sh | 13 ------------- test/sharness/t0240-republisher.sh | 7 ------- 3 files changed, 33 deletions(-) diff --git a/test/sharness/t0121-bootstrap-iptb.sh b/test/sharness/t0121-bootstrap-iptb.sh index abf2be049..290ebe879 100755 --- a/test/sharness/t0121-bootstrap-iptb.sh +++ b/test/sharness/t0121-bootstrap-iptb.sh @@ -17,19 +17,6 @@ test_expect_success "disable mdns" ' test_launch_ipfs_daemon -export IPTB_ROOT="`pwd`/.iptb" - -ipfsi() { - dir="$1" - shift - IPFS_PATH="$IPTB_ROOT/$dir" ipfs $@ -} - -check_has_connection() { - node=$1 - ipfsi $node swarm peers | grep ipfs > /dev/null -} - test_expect_success "setup iptb nodes" ' iptb init -n 5 -f --bootstrap=none --port=0 ' diff --git a/test/sharness/t0130-multinode.sh b/test/sharness/t0130-multinode.sh index fa9b9d91c..b1d8578e4 100755 --- a/test/sharness/t0130-multinode.sh +++ b/test/sharness/t0130-multinode.sh @@ -8,19 +8,6 @@ test_description="Test multiple ipfs nodes" . lib/test-lib.sh -export IPTB_ROOT="`pwd`/.iptb" - -ipfsi() { - dir="$1" - shift - IPFS_PATH="$IPTB_ROOT/$dir" ipfs $@ -} - -check_has_connection() { - node=$1 - ipfsi $node swarm peers | grep ipfs > /dev/null -} - startup_cluster() { test_expect_success "start up nodes" ' iptb start diff --git a/test/sharness/t0240-republisher.sh b/test/sharness/t0240-republisher.sh index 71764ae96..54e26cf07 100755 --- a/test/sharness/t0240-republisher.sh +++ b/test/sharness/t0240-republisher.sh @@ -8,15 +8,8 @@ test_description="Test ipfs repo operations" . lib/test-lib.sh -export IPTB_ROOT="`pwd`/.iptb" export DEBUG=true -ipfsi() { - dir="$1" - shift - IPFS_PATH="$IPTB_ROOT/$dir" ipfs "$@" -} - setup_iptb() { test_expect_success "iptb init" ' iptb init -n4 --bootstrap none --port 0