opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-27 16:07:42 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5114 from ipfs/fix/fix-dht-tests

Browse Source 
fixup DHT sharness tests
This commit is contained in:
Whyrusleeping
2018-06-26 13:43:08 -07:00
committed by GitHub
parent ecf7d157a6 384e2c40b2
commit ad83b6fa2d
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/sharness/t0170-dht.sh
View File

@ -4,8 +4,8 @@ test_description="Test dht command"
. lib/test-lib.sh . lib/test-lib.sh
TEST_DHT_VALUE="CAASpgIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8hSwYY1FXqjT5M36O/Q5fBeDhXE5ePvGAeN3MIibfChqQpgqBbXQi1gAp4TQypSTKl/AMy7hfzsKauieim7jHMgIYAB4pLoBQD1qGVn/n7CqzAR3gDg9umIGuAy15oT0uaqMDqSepfnyxEyPDqfDklgvmS/MAwfBHjH2IPcMIaFgZ6d6gVlhmwuH8WVQ/geumDqyKuU9Jy+SUozmxEu2Baylg4fuqxaxoqOiPFZeWKSCFAngFj3NPmLApE0Fy48/eEZ+t7iP6s/raupP4+Jk/AFNDJNos4VxUnLJpZ1g6W5vYkkt1kXbMTaqxFVryCdCW2UEOwEzjGPGkcIE4RJrHAgMBAAE=" TEST_DHT_VALUE="foobar"
TEST_DHT_PATH="/pk/QmepgFW7BHEtU4pZJdxaNiv75mKLLRQnPi1KaaXmQN4V1a" TEST_DHT_PATH="/pk/QmbWTwYGcmdyK9CYfNBcfs9nhZs17a6FQ4Y8oea278xx41"
# start iptb + wait for peering # start iptb + wait for peering
NUM_NODES=5 NUM_NODES=5
@ -29,7 +29,7 @@ test_expect_success 'findpeer' '
# ipfs dht put <key> <value> # ipfs dht put <key> <value>
test_expect_success 'put with good keys' ' test_expect_success 'put with good keys' '
echo "$TEST_DHT_VALUE" | b64decode | ipfsi 0 dht put "$TEST_DHT_PATH" | sort >putted && ipfsi 0 dht put "$TEST_DHT_PATH" "$TEST_DHT_VALUE" | sort >putted &&
[ -s putted ] || [ -s putted ] ||
test_fsh cat putted test_fsh cat putted
' '
@ -41,7 +41,15 @@ test_expect_success 'get with good keys' '
ipfsi 1 dht get "/ipns/$PEERID_2" | grep -aq "/ipfs/$HASH" ipfsi 1 dht get "/ipns/$PEERID_2" | grep -aq "/ipfs/$HASH"
' '
test_expect_failure 'put with bad keys (issue #4611)' ' test_expect_failure 'put with bad keys fails (issue #5113)' '
ipfsi 0 dht put "foo" "bar" >putted
ipfsi 0 dht put "/pk/foo" "bar" >>putted
ipfsi 0 dht put "/ipns/foo" "bar" >>putted
[ ! -s putted ] ||
test_fsh cat putted
'
test_expect_failure 'put with bad keys returns error (issue #4611)' '
! ipfsi 0 dht put "foo" "bar" && ! ipfsi 0 dht put "foo" "bar" &&
! ipfsi 0 dht put "/pk/foo" "bar" && ! ipfsi 0 dht put "/pk/foo" "bar" &&
! ipfsi 0 dht put "/ipns/foo" "bar" ! ipfsi 0 dht put "/ipns/foo" "bar"
@ -70,9 +78,9 @@ test_expect_success 'findprovs' '
## turns out to be the closest to what a key hashes to. ## turns out to be the closest to what a key hashes to.
# TODO: flaky. tracked by https://github.com/ipfs/go-ipfs/issues/2620 # TODO: flaky. tracked by https://github.com/ipfs/go-ipfs/issues/2620
test_expect_success 'query' ' test_expect_success 'query' '
ipfsi 3 dht query banana >actual && ipfsi 3 dht query "$(echo banana | ipfsi 3 add -q)" >actual &&
ipfsi 3 dht query apple >>actual && ipfsi 3 dht query "$(echo apple | ipfsi 3 add -q)" >>actual &&
ipfsi 3 dht query pear >>actual && ipfsi 3 dht query "$(echo pear | ipfsi 3 add -q)" >>actual &&
PEERS=$(wc -l actual | cut -d '"'"' '"'"' -f 1) && PEERS=$(wc -l actual | cut -d '"'"' '"'"' -f 1) &&
[ -s actual ] || [ -s actual ] ||
test_might_fail test_fsh cat actual test_might_fail test_fsh cat actual