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

add correct test for 1515 #5364

Merged
merged 1 commit into from
Aug 13, 2018
Merged

add correct test for 1515 #5364

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
21 changes: 21 additions & 0 deletions test/sharness/lib/test-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,27 @@ file_size() {
$_STAT "$1"
}

directory_size() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just something like du -sb --apparent-size?

Copy link
Member Author

@Stebalien Stebalien Aug 10, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Didn't know about it.
  2. MacOS 😢.

local total=0
local fsize=0
local res=0
find "$1" -type f | ( while read fname; do
fsize=$(file_size "$fname")
res=$?
if ! test $? -eq 0; then
echo "failed to get filesize" >&2
return $res
fi
total=$(expr "$total" + "$fsize")
res=$?
if ! test $? -eq 0; then
echo "filesize not a number: $fsize" >&2
return $res
fi
done
echo "$total" ) # do not remove this subshell
}

test_check_peerid() {
peeridlen=$(echo "$1" | tr -dC "[:alnum:]" | wc -c | tr -d " ") &&
test "$peeridlen" = "46" || {
Expand Down
12 changes: 7 additions & 5 deletions test/sharness/t0080-repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,17 @@ test_expect_success "'ipfs pin rm' output looks good" '
test_cmp expected1 actual1
'

test_expect_failure "ipfs repo gc fully reverse ipfs add" '
test_expect_success "ipfs repo gc fully reverse ipfs add" '
ipfs repo gc &&
random 100000 41 >gcfile &&
disk_usage "$IPFS_PATH/blocks" >expected &&
hash=`ipfs add -q gcfile` &&
expected="$(directory_size "$IPFS_PATH/blocks")" &&
find "$IPFS_PATH/blocks" -type f &&
hash=$(ipfs add -q gcfile) &&
ipfs pin rm -r $hash &&
ipfs repo gc &&
disk_usage "$IPFS_PATH/blocks" >actual &&
test_cmp expected actual
actual=$(directory_size "$IPFS_PATH/blocks") &&
{ test "$actual" -eq "$expected" || test_fsh echo "$actual != $expected"; } &&
{ test "$actual" -gt "0" || test_fsh echo "not($actual > 0)"; }
'

test_expect_success "file no longer pinned" '
Expand Down