Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use prefix in bootstrapWritePeers #4832

Merged
merged 1 commit into from
Mar 23, 2018
Merged

Use prefix in bootstrapWritePeers #4832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/commands/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ func bootstrapWritePeers(w io.Writer, prefix string, peers []string) error {

sort.Stable(sort.StringSlice(peers))
for _, peer := range peers {
_, err := w.Write([]byte(peer + "\n"))
_, err := w.Write([]byte(prefix + peer + "\n"))
if err != nil {
return err
}
Expand Down
75 changes: 42 additions & 33 deletions test/sharness/t0120-bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ test_init_ipfs
# we use a function so that we can run it both offline + online
test_bootstrap_list_cmd() {
printf "" >list_expected

for BP in "$@"
do
echo "$BP" >>list_expected
Expand Down Expand Up @@ -64,9 +65,9 @@ test_bootstrap_cmd() {
'

test_expect_success "'ipfs bootstrap add' output looks good" '
echo $BP1 >add_expected &&
echo $BP2 >>add_expected &&
echo $BP3 >>add_expected &&
echo "added $BP1" >add_expected &&
echo "added $BP2" >>add_expected &&
echo "added $BP3" >>add_expected &&
test_cmp add_expected add_actual
'

Expand All @@ -77,8 +78,8 @@ test_bootstrap_cmd() {
'

test_expect_success "'ipfs bootstrap rm' output looks good" '
echo $BP1 >rm_expected &&
echo $BP3 >>rm_expected &&
echo "removed $BP1" >rm_expected &&
echo "removed $BP3" >>rm_expected &&
test_cmp rm_expected rm_actual
'

Expand All @@ -89,19 +90,19 @@ test_bootstrap_cmd() {
'

test_expect_success "'ipfs bootstrap add --default' output has default BP" '
echo $BP1 >add2_expected &&
echo $BP2 >>add2_expected &&
echo $BP3 >>add2_expected &&
echo $BP4 >>add2_expected &&
echo $BP5 >>add2_expected &&
echo $BP6 >>add2_expected &&
echo $BP7 >>add2_expected &&
echo $BP8 >>add2_expected &&
echo $BP9 >>add2_expected &&
echo $BP10 >>add2_expected &&
echo $BP11 >>add2_expected &&
echo $BP12 >>add2_expected &&
echo $BP13 >>add2_expected &&
echo "added $BP1" >add2_expected &&
echo "added $BP2" >>add2_expected &&
echo "added $BP3" >>add2_expected &&
echo "added $BP4" >>add2_expected &&
echo "added $BP5" >>add2_expected &&
echo "added $BP6" >>add2_expected &&
echo "added $BP7" >>add2_expected &&
echo "added $BP8" >>add2_expected &&
echo "added $BP9" >>add2_expected &&
echo "added $BP10" >>add2_expected &&
echo "added $BP11" >>add2_expected &&
echo "added $BP12" >>add2_expected &&
echo "added $BP13" >>add2_expected &&
test_cmp add2_expected add2_actual
'

Expand All @@ -112,19 +113,19 @@ test_bootstrap_cmd() {
'

test_expect_success "'ipfs bootstrap rm' output looks good" '
echo $BP1 >rm2_expected &&
echo $BP2 >>rm2_expected &&
echo $BP3 >>rm2_expected &&
echo $BP4 >>rm2_expected &&
echo $BP5 >>rm2_expected &&
echo $BP6 >>rm2_expected &&
echo $BP7 >>rm2_expected &&
echo $BP8 >>rm2_expected &&
echo $BP9 >>rm2_expected &&
echo $BP10 >>rm2_expected &&
echo $BP11 >>rm2_expected &&
echo $BP12 >>rm2_expected &&
echo $BP13 >>rm2_expected &&
echo "removed $BP1" >rm2_expected &&
echo "removed $BP2" >>rm2_expected &&
echo "removed $BP3" >>rm2_expected &&
echo "removed $BP4" >>rm2_expected &&
echo "removed $BP5" >>rm2_expected &&
echo "removed $BP6" >>rm2_expected &&
echo "removed $BP7" >>rm2_expected &&
echo "removed $BP8" >>rm2_expected &&
echo "removed $BP9" >>rm2_expected &&
echo "removed $BP10" >>rm2_expected &&
echo "removed $BP11" >>rm2_expected &&
echo "removed $BP12" >>rm2_expected &&
echo "removed $BP13" >>rm2_expected &&
test_cmp rm2_expected rm2_actual
'

Expand All @@ -139,7 +140,11 @@ test_bootstrap_cmd() {
'

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
Expand All @@ -149,7 +154,11 @@ test_bootstrap_cmd() {
'

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
Expand Down