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

use prefix in bootstrapWritePeers

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2018-03-19 01:04:23 +01:00
parent 958483f6bc
commit ed54f58df7
2 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/commands/bootstrap.go
View File

@ -364,7 +364,7 @@ func bootstrapWritePeers(w io.Writer, prefix string, peers []string) error {
sort.Stable(sort.StringSlice(peers)) sort.Stable(sort.StringSlice(peers))
for _, peer := range peers { for _, peer := range peers {
_, err := w.Write([]byte(peer + "\n")) _, err := w.Write([]byte(prefix + peer + "\n"))
if err != nil { if err != nil {
return err return err
} }

75
test/sharness/t0120-bootstrap.sh
View File

@ -28,6 +28,7 @@ test_init_ipfs
# we use a function so that we can run it both offline + online # we use a function so that we can run it both offline + online
test_bootstrap_list_cmd() { test_bootstrap_list_cmd() {
printf "" >list_expected printf "" >list_expected
for BP in "$@" for BP in "$@"
do do
echo "$BP" >>list_expected echo "$BP" >>list_expected
@ -64,9 +65,9 @@ test_bootstrap_cmd() {
' '
test_expect_success "'ipfs bootstrap add' output looks good" ' test_expect_success "'ipfs bootstrap add' output looks good" '
echo $BP1 >add_expected && echo "added $BP1" >add_expected &&
echo $BP2 >>add_expected && echo "added $BP2" >>add_expected &&
echo $BP3 >>add_expected && echo "added $BP3" >>add_expected &&
test_cmp add_expected add_actual test_cmp add_expected add_actual
' '
@ -77,8 +78,8 @@ test_bootstrap_cmd() {
' '
test_expect_success "'ipfs bootstrap rm' output looks good" ' test_expect_success "'ipfs bootstrap rm' output looks good" '
echo $BP1 >rm_expected && echo "removed $BP1" >rm_expected &&
echo $BP3 >>rm_expected && echo "removed $BP3" >>rm_expected &&
test_cmp rm_expected rm_actual test_cmp rm_expected rm_actual
' '
@ -89,19 +90,19 @@ test_bootstrap_cmd() {
' '
test_expect_success "'ipfs bootstrap add --default' output has default BP" ' test_expect_success "'ipfs bootstrap add --default' output has default BP" '
echo $BP1 >add2_expected && echo "added $BP1" >add2_expected &&
echo $BP2 >>add2_expected && echo "added $BP2" >>add2_expected &&
echo $BP3 >>add2_expected && echo "added $BP3" >>add2_expected &&
echo $BP4 >>add2_expected && echo "added $BP4" >>add2_expected &&
echo $BP5 >>add2_expected && echo "added $BP5" >>add2_expected &&
echo $BP6 >>add2_expected && echo "added $BP6" >>add2_expected &&
echo $BP7 >>add2_expected && echo "added $BP7" >>add2_expected &&
echo $BP8 >>add2_expected && echo "added $BP8" >>add2_expected &&
echo $BP9 >>add2_expected && echo "added $BP9" >>add2_expected &&
echo $BP10 >>add2_expected && echo "added $BP10" >>add2_expected &&
echo $BP11 >>add2_expected && echo "added $BP11" >>add2_expected &&
echo $BP12 >>add2_expected && echo "added $BP12" >>add2_expected &&
echo $BP13 >>add2_expected && echo "added $BP13" >>add2_expected &&
test_cmp add2_expected add2_actual test_cmp add2_expected add2_actual
' '
@ -112,19 +113,19 @@ test_bootstrap_cmd() {
' '
test_expect_success "'ipfs bootstrap rm' output looks good" ' test_expect_success "'ipfs bootstrap rm' output looks good" '
echo $BP1 >rm2_expected && echo "removed $BP1" >rm2_expected &&
echo $BP2 >>rm2_expected && echo "removed $BP2" >>rm2_expected &&
echo $BP3 >>rm2_expected && echo "removed $BP3" >>rm2_expected &&
echo $BP4 >>rm2_expected && echo "removed $BP4" >>rm2_expected &&
echo $BP5 >>rm2_expected && echo "removed $BP5" >>rm2_expected &&
echo $BP6 >>rm2_expected && echo "removed $BP6" >>rm2_expected &&
echo $BP7 >>rm2_expected && echo "removed $BP7" >>rm2_expected &&
echo $BP8 >>rm2_expected && echo "removed $BP8" >>rm2_expected &&
echo $BP9 >>rm2_expected && echo "removed $BP9" >>rm2_expected &&
echo $BP10 >>rm2_expected && echo "removed $BP10" >>rm2_expected &&
echo $BP11 >>rm2_expected && echo "removed $BP11" >>rm2_expected &&
echo $BP12 >>rm2_expected && echo "removed $BP12" >>rm2_expected &&
echo $BP13 >>rm2_expected && echo "removed $BP13" >>rm2_expected &&
test_cmp rm2_expected rm2_actual test_cmp rm2_expected rm2_actual
' '
@ -139,7 +140,11 @@ test_bootstrap_cmd() {
' '
test_expect_success "output looks good" ' test_expect_success "output looks good" '
test_cmp add_stdin_actual bpeers echo "added $BP1" > bpeers_add_exp &&
echo "added $BP2" >> bpeers_add_exp &&
echo "added $BP3" >> bpeers_add_exp &&
echo "added $BP4" >> bpeers_add_exp &&
test_cmp add_stdin_actual bpeers_add_exp
' '
test_bootstrap_list_cmd $BP1 $BP2 $BP3 $BP4 test_bootstrap_list_cmd $BP1 $BP2 $BP3 $BP4
@ -149,7 +154,11 @@ test_bootstrap_cmd() {
' '
test_expect_success "output looks good" ' test_expect_success "output looks good" '
test_cmp rm_stdin_actual bpeers echo "removed $BP1" > bpeers_rm_exp &&
echo "removed $BP2" >> bpeers_rm_exp &&
echo "removed $BP3" >> bpeers_rm_exp &&
echo "removed $BP4" >> bpeers_rm_exp &&
test_cmp rm_stdin_actual bpeers_rm_exp
' '
test_bootstrap_list_cmd test_bootstrap_list_cmd